X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=backup.sh;h=a5cc91570a4455e7f90a258a481f761295070fdb;hb=ebd6ca30a863bc9d9d073ab2ea5760f248d2034e;hp=ee6e98b8ed3a5996cd611adcbb1a82b860efc64b;hpb=04a3b7c0ac261b4aff1e21eb6947eb4b58c5df3b;p=backup.sh

diff --git a/backup.sh b/backup.sh
index ee6e98b..a5cc915 100755
--- a/backup.sh
+++ b/backup.sh
@@ -20,6 +20,7 @@ trap die SIGINT SIGTERM
 # Don't start if we're already running
 if [ -e $LOCKFILE ]; then
 	echo `date`": $LOCKFILE exists, exiting."
+	echo `date`": $LOCKFILE exists, exiting." >&2
 	exit 1
 fi;
 touch $LOCKFILE
@@ -112,8 +113,8 @@ backup()
  TARCMD="ssh root@$computer \"$tar --one-file-system -zcf - -C $filesystem . $lastcmd \
 	--exclude-from=$exf\" > $TARFILE"
  echo `date`" $computer: Running $TARCMD" >&2
-
- if eval $TARCMD; then
+ eval $TARCMD;
+ if [ -s $TARFILE ]; then
   mv $TARFILE $DATE.tgz
   #make a filelist.
   #update the datefile if the filelist is ok.
@@ -122,7 +123,7 @@ backup()
     touch -t $DATE ../.date
 
   #make a sortet filelist
-  grep -v ^d $DATE.idx | sort -n -r +2 > $DATE.sdx
+  grep -v ^d $DATE.idx | sort -n -r -k 2 > $DATE.sdx
 
   #fix perm
   chmod 600 *tgz                      #only for us
@@ -184,14 +185,14 @@ do
  #try to copy preeexec and postexec if they exist
 # TODO: Gah, clean this mess!
  [ -f $confdir/preexec.$computer ] && (
-    scp $confdir/preexec.$computer  root@$computer:~/.backup/preexec ||
+    scp $confdir/preexec.$computer  root@$computer:~/.backup/preexec >&2 ||
      ( echo `date`" $computer: Could not copy preexec.$computer to $computer:~/.backup/preexec - skipping backup of $computer"
        R=1
        continue
      )
     )
  [ -f $confdir/postexec.$computer ] && (
-    scp $confdir/postexec.$computer root@$computer:~/.backup/postexec ||
+    scp $confdir/postexec.$computer root@$computer:~/.backup/postexec >&2 ||
      ( echo `date`" $computer: Could not copy postexec.$computer to $computer:~/.backup/postexec - skipping backup of $computer"
        R=1
        continue
@@ -199,7 +200,7 @@ do
     )
 
  #try to run preexec if it exist
- if ! ssh root@$computer "[ -f ~/.backup/preexec ] && /bin/bash -x ~/.backup/preexec" >&2; then
+ if ! ssh root@$computer "[ ! -f ~/.backup/preexec ] || /bin/bash -x ~/.backup/preexec" >&2; then
  	echo `date`" $computer: Could not run $computer:~/.backup/preexec - skipping backup of $computer"
 	R=1
 	continue
@@ -247,7 +248,7 @@ do
   fi
 
   #delete complete backups
-  for full in `ls -1t $storagedir/$computer/$sfilesystem/full/*tgz | tail +$mf`
+  for full in `ls -1t $storagedir/$computer/$sfilesystem/full/*tgz | tail -n +$mf`
   do
    prefix=`echo $full | sed "s/\.[^.]*$//"`
    echo `date`": $computer:$filesystem sletter full $prefix (for mange)" >&2
@@ -264,7 +265,7 @@ do
  done
 
  #try to run postexec if it exist
- if ! ssh root@$computer "[ -f ~/.backup/postexec ] && /bin/bash -x ~/.backup/postexec" >&2; then
+ if ! ssh root@$computer "[ ! -f ~/.backup/postexec ] || /bin/bash -x ~/.backup/postexec" >&2; then
  	echo `date`" $computer: Could not run $computer:~/.backup/postexec"
 	R=1
  fi