Made ssh calls 255 aware.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 4f0dc9adb110220e11b0bd77bc1a27f1decd9d64..df18802d226b8b3e9079458edf2870a1ecac5912 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -18,12 +18,24 @@ function scottyerror {
     echo $(upperme): $@ >&2 
 }
 
     echo $(upperme): $@ >&2 
 }
 

+function ssh255 {
+    ssh $@
+    sshret=$?
+
+    if [ $sshret -eq 255 ]; then
+       scottyerror "SSH connection failed!"
+       exit 1
+    else
+       return $sshret
+    fi
+}
+

 function grepbackups {
 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 {
 }
 
 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
        return 0
     else
        return 1


@@ -78,9 +90,9 @@ function scottysync {
        rsync_exclude=$(eval echo --exclude={$SYNC_EXC} | tr -d {})
     fi
 
        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
        scottyinfo Creating destination directory $REMOTE_HOST:$REMOTE_DIR

-       ssh $REMOTE_HOST "mkdir $REMOTE_DIR"
+       ssh255 $REMOTE_HOST "mkdir $REMOTE_DIR"

     fi
 
     if isIncomplete; then
     fi
 
     if isIncomplete; then


@@ -96,7 +108,7 @@ function scottysync {
     
     if [ $? -eq 0 ]; then
        scottyinfo Timestamping completed backup and linking to current backup
     
     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
 
            "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
 
        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
        else
            break
        fi


@@ -177,12 +189,9 @@ function backmeupscotty {
                 ;;
        esac
     done
                 ;;
        esac
     done

-
-    if (! ssh $REMOTE_HOST exit); then
-       scottyerror "Could not establish SSH connection to $REMOTE_HOST!"
-       exit 1
-    fi
-
+    
+    ssh255 $REMOTE_HOST exit
+    

     if isNthDay; then
        scottyinfo "This is the nth day."
     elif latestTooOld; then
     if isNthDay; then
        scottyinfo "This is the nth day."
     elif latestTooOld; then