From 7c85a9e4391ccb90e6649f81ee47e2b03cf35f0e Mon Sep 17 00:00:00 2001
From: root <empty>
Date: Sat, 4 Feb 2006 13:46:00 +0000
Subject: [PATCH] Fixed "socket ignored" bug. Script dumps error to .tmp_log
 and checks exit status when deciding if it should cat erros. - adamcik

---
 backup-altersex.sh | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/backup-altersex.sh b/backup-altersex.sh
index 2076523..bed53c7 100755
--- a/backup-altersex.sh
+++ b/backup-altersex.sh
@@ -7,15 +7,29 @@ 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
 
-#TODO fix --exclued "hack" that prevents backup of export/nx-chroot/tmp due to socket errors
-# mulig fix er: | grep -v ": socket ignored" | grep -v "tar: Removing leading `/'"
-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
@@ -24,6 +38,10 @@ tar tvvf $NAME.tar > $NAME.idx
 grep -v ^d $NAME.idx | sort -n -r +2  > $NAME.sdx
 
 #fix perm
-chmod 600 *tgz                      #only for us
+chmod 600 *tar                      #only for us
 chmod 644 *sdx *idx 2>/dev/null     #everyone can read
 
+
+# Delete old backup
+
+rm -f $OLD
-- 
2.39.2