Merge pull request #640 from github/hao/fix-progress

Fix track-progress while progress files are not set

Author: jianghao0718

bin/ghe-backup

@@ -118,6 +118,7 @@ cleanup () {
 
   rm -rf "$failures_file"
   rm -f "${GHE_DATA_DIR}/in-progress-backup"
+  rm -rf /tmp/backup-utils-progress/*
 
   # Cleanup SSH multiplexing
   ghe-ssh --clean

bin/ghe-restore

@@ -139,6 +139,9 @@ cleanup () {
     log_error "Failed to remove in-progress file" 1>&3
   fi
 
+  # Remove progress files
+  rm -rf /tmp/backup-utils-progress/*
+
   bm_end "$(basename $0)"
 }
 

share/github-backup-utils/track-progress

@@ -2,11 +2,17 @@
 #/ track-progress: track progress of backup or restore tasks
 
 progress(){
-    
+  ## Those progress files should be created by init_progress function
+  ## If they are not present (e.g., individual script is being invoked directly), 
+  ## we will not track progress
+  if [ -f "/tmp/backup-utils-progress/progress" ] && 
+    [ -f "/tmp/backup-utils-progress/total" ] &&
+    [ -f "/tmp/backup-utils-progress/type" ]; then
     PROGRESS=$(cat /tmp/backup-utils-progress/progress)
     PROGRESS_TOTAL=$(cat /tmp/backup-utils-progress/total)
     PROGRESS_TYPE=$(cat /tmp/backup-utils-progress/type)
     PROGRESS_PERCENT=$( echo "scale = 2; ($PROGRESS / $PROGRESS_TOTAL) * 100" | bc)
     echo $((PROGRESS + 1)) > /tmp/backup-utils-progress/progress
     echo "${PROGRESS_TYPE} progress: $PROGRESS_PERCENT % ($PROGRESS / $PROGRESS_TOTAL ) $1 " > /tmp/backup-utils-progress/info
+  fi
 }