hcoop-backup: Take file from stdin and split it.

[clinton/scripts.git] / hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 0bfb73e..39fb266 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -104,8 +104,8 @@ cat backupfiles | \
 F=hcoop.backup.tar$COMPRESS_EXT.aescrypt
 tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
   $COMPRESS_PROG | \
-  ccrypt -k $KEYFILE -e > $F
-$MOVE_OVER $F
+  ccrypt -k $KEYFILE -e | \
+  $MOVE_OVER $F
 
 # Acquire lock before messing with spamd
 COUNT=0
@@ -126,9 +126,10 @@ touch $LOCK
 F=common.spamd.tar$COMPRESS_EXT.aescrypt
 tar clpf - --ignore-failed-read -C / /var/local/lib/spamd | \
   $COMPRESS_PROG | \
-  ccrypt -k $KEYFILE -e > $F.new
+  ccrypt -k $KEYFILE -e > $F
 rm -f $LOCK
-$MOVE_OVER $F
+< $F $MOVE_OVER $F
+rm -f $F
 
 vos listvol deleuze | \
   tail -n +2 | \
@@ -147,15 +148,15 @@ cat volumes | \
   bash -c \
     "F={}.dump$COMPRESS_EXT.aescrypt ;
      vos dump -id {} -localauth -clone |
-       $COMPRESS_PROG | ccrypt -k $KEYFILE -e > \$F ;
-     $MOVE_OVER \$F"
+       $COMPRESS_PROG | ccrypt -k $KEYFILE -e |
+       $MOVE_OVER \$F"
 
 echo backing up databases
 F=databases.tar$COMPRESS_EXT.aescrypt
 tar -C /var/backups/databases/ -cf - . | \
   $COMPRESS_PROG | \
-  ccrypt -k $KEYFILE -e > $F
-$MOVE_OVER $F
+  ccrypt -k $KEYFILE -e | \
+  $MOVE_OVER $F
 
 grep '[a-z/]' complain && \
   mail -a 'From: The Backup Program <backups@deleuze.hcoop.net>' \