added timestamp to info and error output

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index e17a4c6a215b8f02d4de9eb4e4d6b033eec3a740..152cf86261a0bd3db7becdd8d15319a1349ee670 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -6,16 +6,18 @@ ARCHIVE_KEEPNBACKUPS=30
 ARCHIVE_KEEPNDAYS=30
 BACKUP_RUNEVERYNTHDAY=1
 
-function upperme {
-    echo $(basename $0) | tr '[:lower:]' '[:upper:]'
+_UPPERME=$(echo $(basename $0) | tr '[:lower:]' '[:upper:]')
+
+function timestamp {
+    date +"[%y-%m-%d %H:%M:%S]"
 }
 
 function scottyinfo {
-    echo $(upperme): $@ 
+    echo $(timestamp) $_UPPERME: $@ 
 }
 
 function scottyerror {
-    echo $(upperme): $@ >&2 
+    echo $(timestamp) $_UPPERME: $@ >&2 
 }
 
 function ssh255 {
@@ -126,7 +128,7 @@ 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
 }
@@ -209,7 +211,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