X-Git-Url: http://git.tpope.net/?p=tpope-extra.git;a=blobdiff_plain;f=bin%2Fcritical-backup;h=2eac413ba50077b2596989c119f5cefcc8c8bada;hp=0ddd307125262e44a231e9fb43e6c65b0f22f063;hb=7cedc07cfeb5b1dfa9ff3c1b1ec3082c668f6f45;hpb=399dd8674f82d9c1d8cdb405991d3c61c6ba6749

diff --git a/bin/critical-backup b/bin/critical-backup
index 0ddd307..2eac413 100755
--- a/bin/critical-backup
+++ b/bin/critical-backup
@@ -21,20 +21,19 @@ chmod 0700 /tmp/.critical-$LOGNAME-$$
 sync-tpope -g -a /tmp/.critical-$LOGNAME-$$/tpope.tar
 cd /tmp/.critical-$LOGNAME-$$
 ln -s "$HOME/.cvs" cvs
+ln -s /var/lib/svn svn
 mysqldump --all-databases > mysqldump.sql
 
-tar chf - tpope.tar cvs mysqldump.sql |\
+tar chf - tpope.tar cvs |\
 gpg -qez 9 -r "$GPGID" --batch --no-tty > $ARCHIVE
 
 [ -d "$HOME/backup-`date +%Y`" ] || mkdir "$HOME/backup-`date +%Y`"
 cp $ARCHIVE "$HOME/backup-`date +%Y`/"
-scp -Bq -oSetupTimeout=30 $ARCHIVE patman:backup/ 2>/dev/null || \
-scp -Bq -oSetupTimeout=30 $ARCHIVE chief:backup/ 2>/dev/null
-scp -Bq -oSetupTimeout=30 $ARCHIVE right:backup/ 2>/dev/null
-scp -Bq $ARCHIVE snowball:tpope.tar.gpg 2>/dev/null
+scp -Bq -oSetupTimeout=30 $ARCHIVE tpope-486.jmwaller.com:backup/ 2>/dev/null
+scp -Bq $ARCHIVE steve:tpope.tar.gpg 2>/dev/null
 
 d="`date +%d`"
-if [ "$d" = 1 -o "$d" = 8 -o "$d" = 16 -o "$d" = 23 -o "$1" = "-m" ]; then
+if [ "$d" = 01 -o "$d" = 08 -o "$d" = 16 -o "$d" = 23 -o "$1" = "-m" ]; then
     mimencode $ARCHIVE | mail -s "Backup for `date +%Y-%m-%d`" $EMAIL \
 	-a "Content-Type: application/octet-stream; name=$ARCHIVE" \
 	-a "Content-Disposition: attachment; filename=$ARCHIVE" \
@@ -42,7 +41,9 @@ if [ "$d" = 1 -o "$d" = 8 -o "$d" = 16 -o "$d" = 23 -o "$1" = "-m" ]; then
 	-a "From: $FROM"
 fi
 
-if   [ "`date +%m%d`" = "0101" -o "$1" = "-c" ]; then
+if true; then
+    :
+elif [ "`date +%m%d`" = "0101" -o "$1" = "-c" ]; then
     mkisofs -r -J -o back.iso "$HOME/backup-`date +%Y`" 2>/dev/null
     if ! sudo cdrecord -tao -data -multi speed=4 back.iso 2>/dev/null; then
 	echo "Error: blank CD not found.  Please call `basename $0` manually" >&2
@@ -56,11 +57,13 @@ elif [ "`date +%m%d`" = "1231" ]; then
 	echo "Error.  Is the CD in the drive?" >&2
     fi
     echo "Yearly backup finished.  Please put a blank CD in the drive." >&2
-elif [ "$d" = 1 -o "$d" = 8 -o "$d" = 16 -o "$d" = 23 ]; then
+elif [ "$d" = 01 -o "$d" = 08 -o "$d" = 16 -o "$d" = 23 ]; then
     s="`sudo cdrecord -msinfo 2>/dev/null`"
+    echo "s=$s"
     if [ "$s" ]; then
-	mkisofs -r -J -o back.iso -M /dev/cdr -C "$s" "$HOME/backup-`date +%Y`" 2>/dev/null
-	sudo cdrecord -tao -data -multi speed=4 back.iso >/dev/null 2>&1
+	mkisofs -r -J -o back.iso -M /dev/cdr -C "$s" "$HOME/backup-`date +%Y`" 
+	sudo cdrecord -tao -data -multi speed=4 back.iso || \
+	echo "CD burning failed." >&2
     else
 	echo "Error.  Is the CD in the drive?" >&2
     fi