removed script name from loglines

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 80392a3b277ca6144651f413c4cd312a583e40c2..ff0f07ffa66104a53932bc3d428a61f0bdf80ee0 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -7,18 +7,17 @@ ARCHIVE_KEEPNDAYS=30
 BACKUP_RUNEVERYNTHDAY=1
 
 _ERROR_ENCOUNTERED=0
 BACKUP_RUNEVERYNTHDAY=1
 
 _ERROR_ENCOUNTERED=0

-_UPPERME=$(echo $(basename $0) | tr '[:lower:]' '[:upper:]')

 
 function timestamp {
 
 function timestamp {

-    date +"[%y-%m-%d %H:%M:%S]"
+    date +'[%y-%m-%d|%H:%M:%S]'

 }
 
 function scottyline {
 }
 
 function scottyline {

-    echo $(timestamp) $_UPPERME: $@
+    echo $(timestamp) $@

 }
 
 function scottyinfo {
 }
 
 function scottyinfo {

-    if ($_ERROR_ENCOUNTERED -eq 0); then
+    if [ $_ERROR_ENCOUNTERED -eq 0 ]; then

        scottyline $@
     else
        scottyline $@ >&2
        scottyline $@
     else
        scottyline $@ >&2


@@ -27,7 +26,10 @@ function scottyinfo {
 
 function scottyerror {
     scottyline $@ >&2
 
 function scottyerror {
     scottyline $@ >&2

-    _ERROR_ENCOUNTERED=1
+    if [ $_ERROR_ENCOUNTERED -eq 0 ]; then
+       _ERROR_ENCOUNTERED=1
+       scottyline "Going into verbose mode after error encounter." >&2
+    fi

 }
 
 function ssh255 {
 }
 
 function ssh255 {