Using -k 2 rather than +2 for sorting by column 2

[backup.sh] / backup.sh

diff --git a/backup.sh b/backup.sh
index 4d8565bea85cefd208d9338f9ffa59feadbdef14..ae4067859d755df691d2ac4747caadc871420a0e 100755 (executable)
--- a/backup.sh
+++ b/backup.sh
@@ -25,10 +25,14 @@
 #
 # The script is halfway Norwegian and halfway English. Newer modifications are
 # in English, we should probably stick to that.
-
-# TODO(sesse, 2007-12-16): 
-#  * Sjekk hvorfor .idx-filene til UD er blitt 0 for siste fullbackuper
-#  * Rydde uleselig kode fra linje 211 og litt nedover
+# 
+# Known issues:
+#
+# o $R has no proper meaning because of the forking subshell stuff. We need a
+#   more robust way of returning non-zero on errors, which we probably don't
+#   right now.
+# o The code around line 211 and downwards is messy.
+#
 
 # Configuration
 LOCKFILE=/home/backup/backuprun.lockfile
@@ -59,11 +63,12 @@ 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
+       echo `date`": $LOCKFILE exists for pid `cat $LOCKFILE`, exiting."
+       echo `date`": $LOCKFILE exists for pid `cat $LOCKFILE`, exiting." >&2
        exit 1
 fi;
 touch $LOCKFILE
+echo $$ > $LOCKFILE
 
 #syntax of remotestat:
 #hostname:/directory/
@@ -142,8 +147,8 @@ backup()
   # Update timestamp
   echo $DATEs > ../.date && touch -t $DATE ../.date
 
-  # Make a sorted filelist
-  grep -v ^d $DATE.idx | sort -n -r -k 2 > $DATE.sdx
+  # Make a sorted filelist as well
+  sort -k6 < $DATE.idx > $DATE.sdx
 
   # Fix permissions
   chmod 600 *tgz                      #only for us