X-Git-Url: https://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/190f715747bca44914cb8904e3b07c2d499f44f4..f877daff4c14c12d44baca7c0abe84ffc424057f:/backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 152cf86..1df23cd 100644
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -6,18 +6,31 @@ ARCHIVE_KEEPNBACKUPS=30
 ARCHIVE_KEEPNDAYS=30
 BACKUP_RUNEVERYNTHDAY=1
 
+_ERROR_ENCOUNTERED=0
 _UPPERME=$(echo $(basename $0) | tr '[:lower:]' '[:upper:]')
 
 function timestamp {
-    date +"[%y-%m-%d %H:%M:%S]"
+    date +'[%y-%m-%d|%H:%M:%S]'
+}
+
+function scottyline {
+    echo $(timestamp) $_UPPERME: $@
 }
 
 function scottyinfo {
-    echo $(timestamp) $_UPPERME: $@ 
+    if [ $_ERROR_ENCOUNTERED -eq 0 ]; then
+	scottyline $@
+    else
+	scottyline $@ >&2
+    fi
 }
 
 function scottyerror {
-    echo $(timestamp) $_UPPERME: $@ >&2 
+    scottyline $@ >&2
+    if [ $_ERROR_ENCOUNTERED -eq 0 ]; then
+	_ERROR_ENCOUNTERED=1
+	scottyline "Going into verbose mode after error encounter." >&2
+    fi
 }
 
 function ssh255 {
@@ -112,6 +125,8 @@ function scottysync {
 	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