whitespace cleanup

diff --git a/backmeupscotty b/backmeupscotty
index d6f358fd63dd8f77adde92d8830af3eb86e1c523..e1fe9a54d2387bd72c79fa398251056e43c6b4cd 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -21,15 +21,15 @@ function scottyinfo {
     if [ $_ERROR_ENCOUNTERED -eq 0 ]; then
         scottyline $@
     else
-       scottyline $@ >&2
+        scottyline $@ >&2
     fi
 }
 
 function scottyerror {
     scottyline $@ >&2
     if [ $_ERROR_ENCOUNTERED -eq 0 ]; then
-       _ERROR_ENCOUNTERED=1
-       scottyline "Going into verbose mode after error encounter." >&2
+        _ERROR_ENCOUNTERED=1
+        scottyline "Going into verbose mode after error encounter." >&2
     fi
 }
 
@@ -38,10 +38,10 @@ function ssh255 {
     sshret=$?
 
     if [ $sshret -eq 255 ]; then
-       scottyerror "SSH connection failed!"
-       exit 1
+        scottyerror "SSH connection failed!"
+        exit 1
     else
-       return $sshret
+        return $sshret
     fi
 }
 
@@ -51,29 +51,29 @@ function grepbackups {
 
 function isIncomplete {
     if ( ssh255 $REMOTE_HOST '[ -d '$REMOTE_DIR/incomplete' ]' ); then
-       return 0
+        return 0
     else
-       return 1
+        return 1
     fi
 }
 
 function isNthDay {
     if [ $(( ( $(date +%s) / (60*60*24) ) % $BACKUP_RUNEVERYNTHDAY )) -eq 0 ];
     then
-       return 0
+        return 0
     else
-       return 1
+        return 1
     fi
 }
 
 function latestTooOld {
     for oldbackup in $(grepbackups); do
-       tstamp=$(echo $oldbackup | cut -d'-' -f1)
+        tstamp=$(echo $oldbackup | cut -d'-' -f1)
 
-       if [ $(( $(date +%s) - $tstamp )) -lt $(( ($BACKUP_RUNEVERYNTHDAY*24+12)*60*60 )) ]
-       then
-           return 1
-       fi
+        if [ $(( $(date +%s) - $tstamp )) -lt $(( ($BACKUP_RUNEVERYNTHDAY*24+12)*60*60 )) ]
+        then
+            return 1
+        fi
     done
 
     return 0
@@ -85,13 +85,13 @@ function scottysync {
     scottyinfo "Syncing $SYNC_SRC to $REMOTE_HOST:$REMOTE_DIR @$timestamp."
 
     if [ ! -d "$SYNC_SRC" ]; then
-       scottyerror "Source dir $SYNC_SRC does not exist. Not syncing!"
-       return 1
+        scottyerror "Source dir $SYNC_SRC does not exist. Not syncing!"
+        return 1
     fi
 
     if [ $(ls -A "$SYNC_SRC" | wc -l) -eq 0 ]; then
-       scottyerror "Source dir $SYNC_SRC is empty. Not syncing!"
-       return 1
+        scottyerror "Source dir $SYNC_SRC is empty. Not syncing!"
+        return 1
     fi
 
     dir_current=$REMOTE_DIR/current
@@ -99,18 +99,18 @@ function scottysync {
     dir_timestamped=$REMOTE_DIR/$timestamp-$(date -d @$timestamp +%Y%m%d%H%M%S)
 
     if [ -z $SYNC_EXC ]; then
-       rsync_exclude=""
+        rsync_exclude=""
     else
-       rsync_exclude=$(eval echo --exclude={$SYNC_EXC} | tr -d {})
+        rsync_exclude=$(eval echo --exclude={$SYNC_EXC} | tr -d {})
     fi
 
     if (ssh255 $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
-       scottyinfo "Creating destination directory $REMOTE_HOST:$REMOTE_DIR."
-       ssh255 $REMOTE_HOST "mkdir $REMOTE_DIR"
+        scottyinfo "Creating destination directory $REMOTE_HOST:$REMOTE_DIR."
+        ssh255 $REMOTE_HOST "mkdir $REMOTE_DIR"
     fi
 
     if isIncomplete; then
-       scottyerror "Continuing old incomplete backup."
+        scottyerror "Continuing old incomplete backup."
     fi
 
     scottyinfo "Starting rsync."
@@ -121,30 +121,30 @@ function scottysync {
           $SYNC_SRC/ $REMOTE_HOST:$dir_incomplete/
 
     if [ $? -eq 0 ]; then
-       scottyinfo "Timestamping completed backup and linking to current backup."
-       ssh255 $REMOTE_HOST \
-              "mv $dir_incomplete $dir_timestamped && rm -f $dir_current && \
+        scottyinfo "Timestamping completed backup and linking to current backup."
+        ssh255 $REMOTE_HOST \
+               "mv $dir_incomplete $dir_timestamped && rm -f $dir_current && \
                ln -s $(basename $dir_timestamped) $dir_current"
     else
-       scottyerror "Rsync failed."
+        scottyerror "Rsync failed."
     fi
 
     while [ $(grepbackups | wc -l) -gt $ARCHIVE_KEEPNBACKUPS ]; do
-       oldestbackup=$(grepbackups | head -1)
-       oldestbackuptstamp=$(echo $oldestbackup | cut -d'-' -f1)
-
-       if [ $oldestbackuptstamp -lt $(( $(date +%s) - $ARCHIVE_KEEPNDAYS*60*60*24 )) ]; then
-           scottyinfo "Removing old backup $oldestbackup."
-           ssh255 $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
-       else
-           break
-       fi
+        oldestbackup=$(grepbackups | head -1)
+        oldestbackuptstamp=$(echo $oldestbackup | cut -d'-' -f1)
+
+        if [ $oldestbackuptstamp -lt $(( $(date +%s) - $ARCHIVE_KEEPNDAYS*60*60*24 )) ]; then
+            scottyinfo "Removing old backup $oldestbackup."
+            ssh255 $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
+        else
+            break
+        fi
     done
 }
 
 function deleteLock {
     if ! rmdir /var/lock/$(basename $0); then
-       scottyerror "Could not delete lockfile /tmp/$(basename $0).lock!"
+        scottyerror "Could not delete lockfile /tmp/$(basename $0).lock!"
     fi
 }
 
@@ -154,8 +154,8 @@ function cleanup_abort {
     cleanup ABORT
 
     if [ $(jobs -p) ]; then
-       scottyerror "TERMinating remaining child processes."
-       kill $(jobs -p)
+        scottyerror "TERMinating remaining child processes."
+        kill $(jobs -p)
     fi
 
     deleteLock
@@ -189,29 +189,29 @@ EOF
 
 function backmeupscotty {
     while getopts "qn:h" opt; do
-       case $opt in
-           q)
-               exec > /dev/null
-               ;;
-           n)
-               BACKUP_RUNEVERYNTHDAY=$OPTARG
-               ;;
-           h)
-               printhelp
+        case $opt in
+            q)
+                exec > /dev/null
+                ;;
+            n)
+                BACKUP_RUNEVERYNTHDAY=$OPTARG
+                ;;
+            h)
+                printhelp
                 exit 0
                 ;;
-       esac
+        esac
     done
 
     ssh255 $REMOTE_HOST exit
 
     if latestTooOld; then
-       scottyerror "The latest backup is too old."
+        scottyerror "The latest backup is too old."
     elif isNthDay; then
-       scottyinfo "This is the nth day."
+        scottyinfo "This is the nth day."
     else
-       scottyinfo "No backup has to be done. Exiting."
-       exit 0
+        scottyinfo "No backup has to be done. Exiting."
+        exit 0
     fi
 
     scottyinfo "Performing backup."