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

diff --git a/backmeupscotty b/backmeupscotty
index 68afaf6..1df23cd 100644
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -6,16 +6,31 @@ 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
+    if [ $_ERROR_ENCOUNTERED -eq 0 ]; then
+	_ERROR_ENCOUNTERED=1
+	scottyline "Going into verbose mode after error encounter." >&2
+    fi
 }
 
 function ssh255 {
@@ -110,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
@@ -126,7 +143,7 @@ function scottysync {
 }
 
 function deleteLock {
-    if ! rmdir /var/run/$(basename $0).lock; then
+    if ! rmdir /var/lock/$(basename $0); then
 	scottyerror "Could not delete lockfile /tmp/$(basename $0).lock!"
     fi
 }
@@ -209,7 +226,7 @@ function backmeupscotty {
     exit 0
 }
 
-if ! mkdir /var/run/$(basename $0).lock; then
+if ! mkdir /var/lock/$(basename $0); then
     scottyerror "Another instance of $(basename $0) is still running!"
     exit 1
 else