Cleaned up info and error messages.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 3ee85c91ba37541eb04d831d78fba98a09ca4868..be1ce209a4de43dba7ad413ce52cc98a3d9f0fc9 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -68,15 +68,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
 
@@ -91,15 +91,15 @@ function scottysync {
     fi
 
     if (ssh255 $REMOTE_HOST '[ ! -d '$REMOTE_DIR' ]'); then
-       scottyinfo Creating destination directory $REMOTE_HOST:$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
+    scottyinfo "Starting rsync."
     rsync -e ssh \
        -v -aHAX --numeric-ids --delete --delete-excluded \
        --link-dest=$dir_current \
@@ -107,7 +107,7 @@ function scottysync {
        $SYNC_SRC/ $REMOTE_HOST:$dir_incomplete/
     
     if [ $? -eq 0 ]; then
-       scottyinfo Timestamping completed backup and linking to current backup
+       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"
     fi
@@ -117,7 +117,7 @@ function scottysync {
        oldestbackuptstamp=$(echo $oldestbackup | cut -d'-' -f1)
 
        if [ $oldestbackuptstamp -lt $(( $(date +%s) - $ARCHIVE_KEEPNDAYS*60*60*24 )) ]; then
-           scottyinfo Removing old backup $oldestbackup
+           scottyinfo "Removing old backup $oldestbackup."
            ssh255 $REMOTE_HOST rm -r "$REMOTE_DIR/$oldestbackup"
        else
            break
@@ -132,16 +132,16 @@ function deleteLock {
 }
 
 function prepare {
-    scottyinfo "Preparing for sync"
+    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