X-Git-Url: https://git.sesse.net/?p=backup.sh;a=blobdiff_plain;f=backup-altersex.sh;h=6ab6fd6c409d70a46166a6d2c89e92b3dbd86bf5;hp=fbdc8dabefc2c32edae755b908a251a2c7790462;hb=5cc0592bad59b6f6d978b768924849be33a2145c;hpb=6b96bb80d6082afcd84a29dcd1e298176724b098

diff --git a/backup-altersex.sh b/backup-altersex.sh
index fbdc8da..6ab6fd6 100755
--- a/backup-altersex.sh
+++ b/backup-altersex.sh
@@ -7,12 +7,41 @@ set -e
 if [ ! -d /backup/altersex/_export/full ]; then
 	mkdir -p /backup/altersex/_export/full
 fi
-rm -f /backup/altersex/_export/full/*
 
+# Finn den gamle backupen som skal slettes etter at den nye er laget
+OLD=$( ls /backup/altersex/_export/full/ )
 NAME=$( date "+%Y%m%d%H%M" )
 
 cd /backup/altersex/_export/full
 
-ssh root@altersex.samfundet.no tar -cf - --one-file-system --exclude=export/debian --exclude=export/progdist --exclude=export/scratch --exclude=export/nx-chroot/tmp /export > $NAME.tar
+ssh root@altersex.samfundet.no tar -cf - --one-file-system --exclude=export/debian --exclude=export/progdist --exclude=export/scratch --exclude=export/nx-chroot/tmp /export > $NAME.tar 2> .tmp_log
+
+# sjekk return veriden til ssh / tar, hvis den ikke er nul så skal vi 
+# dumpe hva som har hent og avslutte. (kunne vel egentlig puttet ssh / tar 
+# direkte inn i if'en men blir mer rydig slik det er nå) - adamcik
+
+if [ $? -ne 0 ]
+then
+  cat .tmp_log
+  rm .tmp_log
+  exit 1
+else
+  rm .tmp_log
+fi
+  
+
+
+#make filelist
 tar tvvf $NAME.tar > $NAME.idx
 
+#make a sortet filelist
+grep -v ^d $NAME.idx | sort -n -r -k 2  > $NAME.sdx
+
+#fix perm
+chmod 600 *tar                      #only for us
+chmod 644 *sdx *idx 2>/dev/null     #everyone can read
+
+
+# Delete old backup
+
+rm -f $OLD