From bc16fd9e951108bf9ddbee92f9bc5b35878d1e59 Mon Sep 17 00:00:00 2001
From: mwolson_admin <mwolson_admin@deleuze.hcoop.net>
Date: Fri, 27 Jun 2008 10:28:43 -0400
Subject: [PATCH 1/1] hcoop-backup: Clean up messages, remove -e on bash
 subprocess.

---
 hcoop-backup | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/hcoop-backup b/hcoop-backup
index 98920db..366efef 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -29,11 +29,10 @@ mkdir -p $BACKUPTMP
 cd $BACKUPTMP
 
 groups
-echo 'I am in:'
-pwd
+echo "I am in: $(pwd)"
 echo
 
-echo building package lists...
+echo "Building package lists..."
 dpkg-query -W -f='${Package}\n' > packages
 (cd /; find / /usr/ /usr/local/ /var/ -xdev)   | sort | uniq > allfiles
 dpkg-query -W -f='${Package}\n'      | xargs dpkg -L | sort | uniq > debfiles
@@ -146,13 +145,13 @@ vos listvol deleuze | \
 cat volumes | \
   grep -v not-backed-up | \
   xargs -I{} -d\\n -- \
-  bash -e -c \
+  bash -c \
     "F={}.dump$COMPRESS_EXT.aescrypt ;
      vos dump -id {} -localauth -clone |
        $COMPRESS_PROG | ccrypt -k $KEYFILE -e |
        $MOVE_OVER $CURDATE \$F"
 
-echo backing up databases
+echo "Backing up databases ..."
 F=databases.tar$COMPRESS_EXT.aescrypt
 tar -C /var/backups/databases/ -cf - . | \
   $COMPRESS_PROG | \
@@ -163,7 +162,6 @@ grep '[a-z/]' complain && \
   mail -a 'From: The Backup Program <backups@deleuze.hcoop.net>' \
        -s "automated message: annoying files found on deleuze (please do something about them)" admins@hcoop.net \
        < complain \
-  || true
-
-echo done
+  || :
 
+echo "Done."
-- 
2.20.1