formatting

[backmeupscotty.git] / backmeupscotty

diff --git a/backmeupscotty b/backmeupscotty
index 5aa72cc790e31a27b3387c453ebe53b1da71f6bb..d6f358fd63dd8f77adde92d8830af3eb86e1c523 100644 (file)
--- a/backmeupscotty
+++ b/backmeupscotty
@@ -5,21 +5,21 @@ REMOTE_DIR=/tmp/backmeupscotty/test
 ARCHIVE_KEEPNBACKUPS=30
 ARCHIVE_KEEPNDAYS=30
 BACKUP_RUNEVERYNTHDAY=1
 ARCHIVE_KEEPNBACKUPS=30
 ARCHIVE_KEEPNDAYS=30
 BACKUP_RUNEVERYNTHDAY=1

+BWLIMIT=500KiB

 
 _ERROR_ENCOUNTERED=0
 
 _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 {
     if [ $_ERROR_ENCOUNTERED -eq 0 ]; then
 }
 
 function scottyinfo {
     if [ $_ERROR_ENCOUNTERED -eq 0 ]; then

-       scottyline $@
+        scottyline $@

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


@@ -27,7 +27,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 {


@@ -55,20 +58,19 @@ function isIncomplete {
 }
 
 function isNthDay {
 }
 
 function isNthDay {

-    if [ $(( ( $(date +%s) / (60*60*24) ) % $BACKUP_RUNEVERYNTHDAY )) -eq 0 ]; 
+    if [ $(( ( $(date +%s) / (60*60*24) ) % $BACKUP_RUNEVERYNTHDAY )) -eq 0 ];

     then
        return 0
     else
        return 1
     then
        return 0
     else
        return 1

-    fi 
+    fi

 }
 
 function latestTooOld {
     for oldbackup in $(grepbackups); do
        tstamp=$(echo $oldbackup | cut -d'-' -f1)
 }
 
 function latestTooOld {
     for oldbackup in $(grepbackups); do
        tstamp=$(echo $oldbackup | cut -d'-' -f1)

-       
-       if [ $(( $(date +%s) - $tstamp )) -lt \
-           $(( ($BACKUP_RUNEVERYNTHDAY*24+12)*60*60 )) ]
+
+       if [ $(( $(date +%s) - $tstamp )) -lt $(( ($BACKUP_RUNEVERYNTHDAY*24+12)*60*60 )) ]

        then
            return 1
        fi
        then
            return 1
        fi


@@ -112,16 +114,17 @@ function scottysync {
     fi
 
     scottyinfo "Starting rsync."
     fi
 
     scottyinfo "Starting rsync."

-    rsync -e ssh \
-       -v -aHAX --numeric-ids --delete --delete-excluded \
-       --link-dest=$dir_current \
-       $rsync_exclude \
-       $SYNC_SRC/ $REMOTE_HOST:$dir_incomplete/
-    
+    rsync -e ssh --bwlimit=$BWLIMIT \
+          -v -aHAX --numeric-ids --delete --delete-excluded \
+          --link-dest=$dir_current \
+          $rsync_exclude \
+          $SYNC_SRC/ $REMOTE_HOST:$dir_incomplete/
+

     if [ $? -eq 0 ]; then
        scottyinfo "Timestamping completed backup and linking to current backup."
        ssh255 $REMOTE_HOST \
     if [ $? -eq 0 ]; then
        scottyinfo "Timestamping completed backup and linking to current backup."
        ssh255 $REMOTE_HOST \

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

     else
        scottyerror "Rsync failed."
     fi
     else
        scottyerror "Rsync failed."
     fi


@@ -199,7 +202,7 @@ function backmeupscotty {
                 ;;
        esac
     done
                 ;;
        esac
     done

-    
+

     ssh255 $REMOTE_HOST exit
 
     if latestTooOld; then
     ssh255 $REMOTE_HOST exit
 
     if latestTooOld; then