X-Git-Url: https://git.treefish.org/~alex/backmeupscotty.git/blobdiff_plain/d34265295e889746affba716d96b4b8f50af362e..393f03ad49a1175b5a5b7cf0729f975073d2d1cc:/backmeupscotty?ds=inline

diff --git a/backmeupscotty b/backmeupscotty
index 1b7fa19..7aa814a 100644
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -5,6 +5,23 @@ REMOTE_BASE=/tmp/backmeupscotty
 ARCHIVE_KEEPNBACKUPS=30
 ARCHIVE_KEEPNDAYS=30
 
+function upperme {
+    echo $(basename $0) | tr '[:lower:]' '[:upper:]'
+}
+
+function scottyinfo {
+    echo $(upperme): $@ 
+}
+
+function scottyerror {
+    echo $(upperme): $@ >&2 
+}
+
+if [ $(pidof -x $(basename $0) | wc -w) -gt 2 ]; then 
+    scottyerror Another instance of $(basename $0) is already running!
+    exit 1
+fi
+
 while getopts ":q" opt; do
     case $opt in
 	q)
@@ -20,7 +37,17 @@ function grepbackups {
 function scottysync {
     timestamp=$(date +%s)
 
-    echo BACKMEUPSCOTTY: Syncing $1 to $REMOTE_HOST:$REMOTE_BASE/$2 @$timestamp
+    scottyinfo Syncing $1 to $REMOTE_HOST:$REMOTE_BASE/$2 @$timestamp
+
+    if [ ! -d "$1" ]; then
+	scottyerror Source dir $1 does not exist. Not syncing!
+	return 1
+    fi
+
+    if [ $(ls -A "$1" | wc -l) -eq 0 ]; then
+	scottyerror Source dir $1 is empty. Not syncing!
+	return 1
+    fi
 
     dir_current=$REMOTE_BASE/$2/current
     dir_incomplete=$REMOTE_BASE/$2/incomplete
@@ -33,11 +60,15 @@ function scottysync {
     fi
 
     if (ssh $REMOTE_HOST '[ ! -d '$REMOTE_BASE/$2' ]'); then
-	echo BACKMEUPSCOTTY: Creating destination directory $REMOTE_HOST:$REMOTE_BASE/$2
+	scottyinfo Creating destination directory $REMOTE_HOST:$REMOTE_BASE/$2
 	ssh $REMOTE_HOST "mkdir $REMOTE_BASE/$2"
     fi
 
-    echo BACKMEUPSCOTTY: Starting rsync
+    if (ssh $REMOTE_HOST '[ -d '$REMOTE_BASE/$2/incomplete' ]'); then
+	scottyerror Continuing old incomplete backup
+    fi
+
+    scottyinfo Starting rsync
     rsync -e ssh \
 	-v -aHAX --numeric-ids --delete --delete-excluded \
 	--link-dest=$dir_current \
@@ -45,7 +76,7 @@ function scottysync {
 	$1/ $REMOTE_HOST:$dir_incomplete/
     
     if [ $? -eq 0 ]; then
-	echo BACKMEUPSCOTTY: Timestamping completed backup and linking to current backup
+	scottyinfo Timestamping completed backup and linking to current backup
 	ssh $REMOTE_HOST \
 	    "mv $dir_incomplete $dir_timestamped && rm -f $dir_current && ln -s $dir_timestamped $dir_current"
     fi
@@ -55,7 +86,7 @@ function scottysync {
 	oldestbackuptstamp=$(echo $oldestbackup | cut -d'-' -f1)
 
 	if [ $oldestbackuptstamp -lt $(( $(date +%s) - $ARCHIVE_KEEPNDAYS*60*60*24 )) ]; then
-	    echo BACKMEUPSCOTTY: Removing old backup $oldestbackup
+	    scottyinfo Removing old backup $oldestbackup
 	    ssh $REMOTE_HOST rm -r "$REMOTE_BASE/$2/$oldestbackup"
 	else
 	    break