X-Git-Url: https://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/69c4602aca9da2729e48a0027b7f18be9fd1abdd..6b669353824a74a935077f40dd70662597d8922d:/backmeupscotty?ds=sidebyside

diff --git a/backmeupscotty b/backmeupscotty
index 68afaf6..ad2fa65 100644
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -6,16 +6,14 @@ 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 scottyinfo {
-    echo $(upperme): $@ 
+    echo $_UPPERME: $@ 
 }
 
 function scottyerror {
-    echo $(upperme): $@ >&2 
+    echo $_UPPERME: $@ >&2 
 }
 
 function ssh255 {
@@ -126,7 +124,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 +207,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