From 0f852938dfa62b53028bee6a7cfb7492a4f7220f Mon Sep 17 00:00:00 2001
From: K Jonathan Harker <k.jonathan.harker@hp.com>
Date: Wed, 3 Sep 2014 19:06:12 -0700
Subject: [PATCH] Clean up bashate failures

Fix all of the bashate failures.  Also, bashate will install its negative
tests in its virtualenv, so we need to generate a list of files to pass to
bashate that excludes .tox/

Change-Id: I55559bf6137f705aec9a7f277928ad8d4cadc2ca
---
 files/tmpreaper.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/files/tmpreaper.sh b/files/tmpreaper.sh
index 8790e30..b66f84c 100755
--- a/files/tmpreaper.sh
+++ b/files/tmpreaper.sh
@@ -41,10 +41,10 @@ if grep '^TMPTIME=' /etc/default/rcS >/dev/null 2>&1; then
         # Don't clean files if TMPTIME is negative or 'infinite'
         # to mimic the way /lib/init/bootclean.sh works.
         case "$TMPTIME" in
-          -*|infinite|infinity)
+            -*|infinite|infinity)
                 # don't use this as default
                 ;;
-           *)
+            *)
                 if [ "$TMPTIME" -gt 0 ]; then
                     TMPREAPER_TIME=${TMPTIME}d
                 else
@@ -96,14 +96,14 @@ TMPREAPER_PROTECT_EXTRA=${TMPREAPER_PROTECT_EXTRA:-''}
 TMPREAPER_DIRS=${TMPREAPER_DIRS:-'/tmp/.'}
 
 nice -n10 tmpreaper --delay=$TMPREAPER_DELAY --mtime-dir --symlinks $TMPREAPER_TIME  \
-  $TMPREAPER_ADDITIONALOPTIONS \
-  --ctime \
-  --protect '/tmp/.X*-{lock,unix,unix/*}' \
-  --protect '/tmp/.ICE-{unix,unix/*}' \
-  --protect '/tmp/.iroha_{unix,unix/*}' \
-  --protect '/tmp/.ki2-{unix,unix/*}' \
-  --protect '/tmp/lost+found' \
-  --protect '/tmp/journal.dat' \
-  --protect '/tmp/quota.{user,group}' \
-  `for i in $TMPREAPER_PROTECT_EXTRA; do echo --protect "$i"; done` \
-  $TMPREAPER_DIRS
+    $TMPREAPER_ADDITIONALOPTIONS \
+    --ctime \
+    --protect '/tmp/.X*-{lock,unix,unix/*}' \
+    --protect '/tmp/.ICE-{unix,unix/*}' \
+    --protect '/tmp/.iroha_{unix,unix/*}' \
+    --protect '/tmp/.ki2-{unix,unix/*}' \
+    --protect '/tmp/lost+found' \
+    --protect '/tmp/journal.dat' \
+    --protect '/tmp/quota.{user,group}' \
+    `for i in $TMPREAPER_PROTECT_EXTRA; do echo --protect "$i"; done` \
+    $TMPREAPER_DIRS