X-Git-Url: https://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/3225479b4910b406043c1e2169f6768b46628686..0984727e5376cebd26b5ff6e9469cfc63d0c756d:/backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 4f0dc9a..80392a3 100644
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -6,24 +6,48 @@ ARCHIVE_KEEPNBACKUPS=30
 ARCHIVE_KEEPNDAYS=30
 BACKUP_RUNEVERYNTHDAY=1
 
-function upperme {
-    echo $(basename $0) | tr '[:lower:]' '[:upper:]'
+_ERROR_ENCOUNTERED=0
+_UPPERME=$(echo $(basename $0) | tr '[:lower:]' '[:upper:]')
+
+function timestamp {
+    date +"[%y-%m-%d %H:%M:%S]"
+}
+
+function scottyline {
+    echo $(timestamp) $_UPPERME: $@
 }
 
 function scottyinfo {
-    echo $(upperme): $@ 
+    if ($_ERROR_ENCOUNTERED -eq 0); then
+	scottyline $@
+    else
+	scottyline $@ >&2
+    fi
 }
 
 function scottyerror {
-    echo $(upperme): $@ >&2 
+    scottyline $@ >&2
+    _ERROR_ENCOUNTERED=1
+}
+
+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 +68,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
@@ -56,15 +80,15 @@ function latestTooOld {
 function scottysync {
     timestamp=$(date +%s)
 
-    scottyinfo Syncing $SYNC_SRC to $REMOTE_HOST:$REMOTE_DIR @$timestamp
+    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!
+	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!
+	scottyerror "Source dir $SYNC_SRC is empty. Not syncing!"
 	return 1
     fi
 
@@ -78,16 +102,16 @@ function scottysync {
 	rsync_exclude=$(eval echo --exclude={$SYNC_EXC} | tr -d {})
     fi
 
-    if (ssh $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
-	scottyinfo Creating destination directory $REMOTE_HOST:$REMOTE_DIR
-	ssh $REMOTE_HOST "mkdir $REMOTE_DIR"
+    if (ssh255 $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
+	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
+    scottyinfo "Starting rsync."
     rsync -e ssh \
 	-v -aHAX --numeric-ids --delete --delete-excluded \
 	--link-dest=$dir_current \
@@ -95,9 +119,11 @@ function scottysync {
 	$SYNC_SRC/ $REMOTE_HOST:$dir_incomplete/
     
     if [ $? -eq 0 ]; then
-	scottyinfo Timestamping completed backup and linking to current backup
-	ssh $REMOTE_HOST \
+	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."
     fi
 
     while [ $(grepbackups | wc -l) -gt $ARCHIVE_KEEPNBACKUPS ]; do
@@ -105,8 +131,8 @@ function scottysync {
 	oldestbackuptstamp=$(echo $oldestbackup | cut -d'-' -f1)
 
 	if [ $oldestbackuptstamp -lt $(( $(date +%s) - $ARCHIVE_KEEPNDAYS*60*60*24 )) ]; then
-	    scottyinfo Removing old backup $oldestbackup
-	    ssh $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
+	    scottyinfo "Removing old backup $oldestbackup."
+	    ssh255 $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
 	else
 	    break
 	fi
@@ -114,22 +140,18 @@ function scottysync {
 }
 
 function deleteLock {
-    if ! rmdir /tmp/$(basename $0).lock; then
+    if ! rmdir /var/lock/$(basename $0); then
 	scottyerror "Could not delete lockfile /tmp/$(basename $0).lock!"
     fi
 }
 
-function prepare {
-    scottyinfo "Preparing for sync"
-}
-
 function cleanup_abort {
-    scottyerror "Caught exit signal! Cleaning up..."
+    scottyerror "Caught exit signal! Cleaning up."
 
     cleanup ABORT
 
     if [ $(jobs -p) ]; then
-	scottyerror TERMinating remaining child processes...
+	scottyerror "TERMinating remaining child processes."
 	kill $(jobs -p)
     fi
 
@@ -177,16 +199,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
@@ -204,7 +223,7 @@ function backmeupscotty {
     exit 0
 }
 
-if ! mkdir /tmp/$(basename $0).lock; then
+if ! mkdir /var/lock/$(basename $0); then
     scottyerror "Another instance of $(basename $0) is still running!"
     exit 1
 else