X-Git-Url: https://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/3225479b4910b406043c1e2169f6768b46628686..85ea4b7f90d54f48e0b3f0b7a71cd05983ed8e50:/backmeupscotty?ds=inline

diff --git a/backmeupscotty b/backmeupscotty
index 4f0dc9a..3ee85c9 100644
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -18,12 +18,24 @@ function scottyerror {
     echo $(upperme): $@ >&2 
 }
 
+function ssh255 {
+    ssh $@
+    sshret=$?
+
+    if [ $sshret -eq 255 ]; then
+	scottyerror "SSH connection failed!"
+	exit 1
+    else
+	return $sshret
+    fi
+}
+
 function grepbackups {
-    ssh $REMOTE_HOST "ls $REMOTE_DIR" | grep -E '[0-9]+-[0-9]+'
+    ssh255 $REMOTE_HOST "ls $REMOTE_DIR" | grep -E '[0-9]+-[0-9]+'
 }
 
 function isIncomplete {
-    if ( ssh $REMOTE_HOST '[ -d '$REMOTE_DIR/incomplete' ]' ); then
+    if ( ssh255 $REMOTE_HOST '[ -d '$REMOTE_DIR/incomplete' ]' ); then
 	return 0
     else
 	return 1
@@ -44,7 +56,7 @@ function latestTooOld {
 	tstamp=$(echo $oldbackup | cut -d'-' -f1)
 	
 	if [ $(( $(date +%s) - $tstamp )) -lt \
-	    $(( $BACKUP_RUNEVERYNTHDAY*24*60*60 )) ]
+	    $(( ($BACKUP_RUNEVERYNTHDAY*24+12)*60*60 )) ]
 	then
 	    return 1
 	fi
@@ -78,9 +90,9 @@ function scottysync {
 	rsync_exclude=$(eval echo --exclude={$SYNC_EXC} | tr -d {})
     fi
 
-    if (ssh $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
+    if (ssh255 $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
 	scottyinfo Creating destination directory $REMOTE_HOST:$REMOTE_DIR
-	ssh $REMOTE_HOST "mkdir $REMOTE_DIR"
+	ssh255 $REMOTE_HOST "mkdir $REMOTE_DIR"
     fi
 
     if isIncomplete; then
@@ -96,7 +108,7 @@ function scottysync {
     
     if [ $? -eq 0 ]; then
 	scottyinfo Timestamping completed backup and linking to current backup
-	ssh $REMOTE_HOST \
+	ssh255 $REMOTE_HOST \
 	    "mv $dir_incomplete $dir_timestamped && rm -f $dir_current && ln -s $(basename $dir_timestamped) $dir_current"
     fi
 
@@ -106,7 +118,7 @@ function scottysync {
 
 	if [ $oldestbackuptstamp -lt $(( $(date +%s) - $ARCHIVE_KEEPNDAYS*60*60*24 )) ]; then
 	    scottyinfo Removing old backup $oldestbackup
-	    ssh $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
+	    ssh255 $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
 	else
 	    break
 	fi
@@ -177,16 +189,13 @@ function backmeupscotty {
                 ;;
 	esac
     done
+    
+    ssh255 $REMOTE_HOST exit
 
-    if (! ssh $REMOTE_HOST exit); then
-	scottyerror "Could not establish SSH connection to $REMOTE_HOST!"
-	exit 1
-    fi
-
-    if isNthDay; then
+    if latestTooOld; then
+	scottyerror "The latest backup is too old."
+    elif isNthDay; then
 	scottyinfo "This is the nth day."
-    elif latestTooOld; then
-	scottyinfo "The latest backup is too old."
     else
 	scottyinfo "No backup has to be done. Exiting."
 	exit 0