X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/9cff4d320746a5622ade02b4be4dde8395f8021f..73df01d433a07ba42606bd7b09eb9a210048181c:/hcoop-backup

diff --git a/hcoop-backup b/hcoop-backup
index 70a9e64..111daca 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -15,8 +15,8 @@ PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
 #COMPRESS_PROG=bzip2
 COMPRESS_EXT=.gz
 COMPRESS_PROG=gzip
-BWLIMIT=250
 # units for BWLIMIT are KB/s
+BWLIMIT=325
 
 IFS=$'\n'
 
@@ -39,13 +39,13 @@ function copy_over () {
     if test -n "$2"; then
         DEST=$DEST/$2
     fi
-    cat $FILE | catsync -b $BWLIMIT $DEST/$FILE
+    < $FILE catsync -b $BWLIMIT $DEST/$FILE
     rm -f $FILE
 }
 
 cd $BACKUPDIR
-find . -mindepth 1 -maxdepth 1 -type d -ctime +3 -delete || true
-
+find . -mindepth 1 -maxdepth 1 -type d -ctime +10 \
+    -execdir rm -fr '{}' \; || true
 rm -rf $SUBDIR
 mkdir -p $SUBDIR
 mkdir -p $BACKUPTMP
@@ -92,8 +92,9 @@ diff allfiles debfiles | grep '^<' | cut -b 3- | \
  grep -v '^/usr/share/info/dir\.old$' | \
  grep -v '^/usr/share/emacs21/site-lisp/' | \
  grep -v '^/usr/share/emacs22/site-lisp/' | \
- grep -v '^/usr/share/vim/addons/doc/tags$' | \
- cat > backupfiles
+ grep -v '^/usr/share/snmp/mibs/\.index$' | \
+ grep -v '^/usr/share/vim/addons/doc/tags$' \
+ > backupfiles
 
 cat conffiles >> backupfiles
 
@@ -104,6 +105,7 @@ cat backupfiles | \
  grep -v ^/var/log | \
  grep -v ^/usr/lib/python2.4/ | \
  grep -v ^/var/lib/python-support | \
+ grep -v ^/usr/share/jed/lib | \
  grep -v ^/usr/share/man | \
  grep -v ^/usr/share/perl5/IkiWiki/Plugin | \
  grep -v ^/media | \
@@ -163,8 +165,8 @@ vos listvol deleuze | \
   grep -v "\.readonly .*$" | \
   sed 's_^ .*__' | \
   sed 's_ .*$__' | \
-  grep '[A-Za-z]' | \
-  cat > volumes
+  grep '[A-Za-z]' \
+  > volumes
 
 cat volumes | \
   grep -v not-backed-up | \
@@ -173,7 +175,7 @@ cat volumes | \
     "F={}.dump$COMPRESS_EXT.aescrypt ;
      vos dump -id {} -localauth -clone |
        $COMPRESS_PROG | ccrypt -k $KEYFILE -e > \$F ;
-     cat \$F | catsync -b $BWLIMIT $BACKUPDIR/$SUBDIR/\$F ;
+     < \$F catsync -b $BWLIMIT $BACKUPDIR/$SUBDIR/\$F ;
      rm -f \$F"
 
 echo backing up databases