workstation-duplicity: changes so I can run script outside of cron

1 files changed, 25 insertions, 22 deletions

diff --git a/bin/workstation-duplicity b/bin/workstation-duplicity
index 14bb22fc..0656e0d5 100755
--- a/bin/workstation-duplicity
+++ b/bin/workstation-duplicity
@@ -18,26 +18,29 @@ if ! [ -e "$HOME/.duply/$DUPLY_PROFILE/conf" ]; then
     exit 1
 fi
 
-# check when we last ran; don't run if it was less than four hours ago
-if [ -e "$FLAG_FILE" ] \
-       && [ -n "$(find $FLAG_FILE -newermt '4 hours ago')" ]; then
-    echo "flag file too new; not backing up"
-    exit 0
-fi
-
-# don't bother if we're not online
-if offline; then
-    echo "not online; not backing up"
-    exit 0
-fi
-
-# don't try to backup immediately; we might not be online for long
-sleep 600
-
-# confirm we're still online
-if offline; then
-    echo "not online; not backing up"
-    exit 0
+# fewer checks if we're running at a terminal (this is a bashism)
+if ! [ -t 1 ];
+   # check when we last ran; don't run if it was less than four hours ago
+   if [ -e "$FLAG_FILE" ] \
+          && [ -n "$(find $FLAG_FILE -newermt '4 hours ago')" ]; then
+       echo "flag file too new; not backing up"
+       exit 0
+   fi
+
+   # don't bother if we're not online
+   if offline; then
+       echo "not online; not backing up"
+       exit 0
+   fi
+
+   # don't try to backup immediately; we might not be online for long
+   sleep 600
+
+   # confirm we're still online
+   if offline; then
+       echo "not online; not backing up"
+       exit 0
+   fi
 fi
 
 if [ -e "$FLAG_FILE" ]; then
@@ -52,6 +55,6 @@ else
     duply $DUPLY_PROFILE full
 fi
 
-# if it was successful, update flag file so we don't do this again for
-# four hours
+# if it was successful, update flag file so cronjob doesn't do this
+# again for four hours
 touch $FLAG_FILE