X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=backup.sh;h=a5cc91570a4455e7f90a258a481f761295070fdb;hb=ebd6ca30a863bc9d9d073ab2ea5760f248d2034e;hp=2838aae5d9bd73a0faf14c74af983fe022e1079c;hpb=8418414e49c7bb8e44bb07a3082f9bbb9ffa8d2b;p=backup.sh

diff --git a/backup.sh b/backup.sh
index 2838aae..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
@@ -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