Made current directory relative.

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 965da294be8c489d9617ffba8a388b53586a3cce..6affc578cc58f4d648e4130710901c2a721b204a 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -5,6 +5,23 @@ REMOTE_BASE=/tmp/backmeupscotty
 ARCHIVE_KEEPNBACKUPS=30
 ARCHIVE_KEEPNDAYS=30
 
 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)
 while getopts ":q" opt; do
     case $opt in
        q)


@@ -20,7 +37,17 @@ function grepbackups {
 function scottysync {
     timestamp=$(date +%s)
 
 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
 
     dir_current=$REMOTE_BASE/$2/current
     dir_incomplete=$REMOTE_BASE/$2/incomplete


@@ -32,7 +59,16 @@ function scottysync {
        rsync_exclude=$(eval echo --exclude={$3} | tr -d {})
     fi
 
        rsync_exclude=$(eval echo --exclude={$3} | tr -d {})
     fi
 

-    echo BACKMEUPSCOTTY: Starting rsync
+    if (ssh $REMOTE_HOST '[ ! -d '$REMOTE_BASE/$2' ]'); then
+       scottyinfo Creating destination directory $REMOTE_HOST:$REMOTE_BASE/$2
+       ssh $REMOTE_HOST "mkdir $REMOTE_BASE/$2"
+    fi
+
+    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 \
     rsync -e ssh \
        -v -aHAX --numeric-ids --delete --delete-excluded \
        --link-dest=$dir_current \


@@ -40,9 +76,9 @@ function scottysync {
        $1/ $REMOTE_HOST:$dir_incomplete/
     
     if [ $? -eq 0 ]; then
        $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 \
        ssh $REMOTE_HOST \

-           "mv $dir_incomplete $dir_timestamped && rm -f $dir_current && ln -s $dir_timestamped $dir_current"
+           "mv $dir_incomplete $dir_timestamped && rm -f $dir_current && ln -s $(basename $dir_timestamped) $dir_current"

     fi
 
     while [ $(grepbackups $2 | wc -l) -gt $ARCHIVE_KEEPNBACKUPS ]; do
     fi
 
     while [ $(grepbackups $2 | wc -l) -gt $ARCHIVE_KEEPNBACKUPS ]; do


@@ -50,7 +86,7 @@ function scottysync {
        oldestbackuptstamp=$(echo $oldestbackup | cut -d'-' -f1)
 
        if [ $oldestbackuptstamp -lt $(( $(date +%s) - $ARCHIVE_KEEPNDAYS*60*60*24 )) ]; then
        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
            ssh $REMOTE_HOST rm -r "$REMOTE_BASE/$2/$oldestbackup"
        else
            break