update file names

Author: gamefiend

bin/ghe-backup

@@ -47,9 +47,9 @@ export CALLING_SCRIPT="ghe-backup"
 # Setup progress tracking
 init-progress
 export PROGRESS_TYPE="Backup"
-echo $PROGRESS_TYPE > /tmp/track-progress-type
+echo $PROGRESS_TYPE > /tmp/backup-utils-progress-type
 export PROGRESS=0 # Used to track progress of backup
-echo $PROGRESS > /tmp/track-progress
+echo $PROGRESS > /tmp/backup-utils-progress
 export PROGRESS_TOTAL=18 # Maximum number of steps in backup
 
 # Check to make sure moreutils parallel is installed and working properly

bin/ghe-progress

@@ -30,26 +30,26 @@ while true; do
 done
 
 check_for_progress_file() {
-    if [ ! -f /tmp/progress-info ]; then
+    if [ ! -f /tmp/backup-utils-progress-info ]; then
         echo "No progress file found. has a backup or restore been started?"
         exit 1
     fi
 }
 
 if [ -n "$ONCE" ]; then
     check_for_progress_file
-    cat /tmp/progress-info
+    cat /tmp/backup-utils-progress-info
 else
     check_for_progress_file
     clear
-    cat /tmp/progress-info
+    cat /tmp/backup-utils-progress-info
     while true; do
     if read -r -t 1 -n 1; then
 	clear
         exit ;
     else
 	clear
-	cat /tmp/progress-info
+	cat /tmp/backup-utils-progress-info
     fi
     done
 fi

bin/ghe-restore

@@ -308,9 +308,9 @@ export PROGRESS_TOTAL=$((OPTIONAL_STEPS + 5))
 
 init-progress
 export PROGRESS_TYPE="Restore"
-echo $PROGRESS_TYPE > /tmp/track-progress-type
+echo $PROGRESS_TYPE > /tmp/backup-utils-progress-type
 export PROGRESS=0 # Used to track progress of restore
-echo $PROGRESS > /tmp/track-progress
+echo $PROGRESS > /tmp/backup-utils-progress
 
 # Log restore start message locally and in /var/log/syslog on remote instance
 START_TIME=$(date +%s)

share/github-backup-utils/ghe-backup-config

@@ -55,7 +55,7 @@ fi
 PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
 # shellcheck source=share/github-backup-utils/bm.sh
 . "$GHE_BACKUP_ROOT/share/github-backup-utils/bm.sh"
-. "$GHE_BACKUP_ROOT/share/github-backup-utils/track-progress"
+. "$GHE_BACKUP_ROOT/share/github-backup-utils/backup-utils-progress"
 # Save off GHE_HOSTNAME from the environment since we want it to override the
 # backup.config value when set.
 GHE_HOSTNAME_PRESERVE="$GHE_HOSTNAME"
@@ -648,7 +648,7 @@ restore-secret() {
 
 #initialize progress tracking by clearing out the temp files used to track
 init-progress() {
-  rm -f /tmp/track-progress-*
+  rm -f /tmp/backup-utils-progress-*
 }
 
 

share/github-backup-utils/track-progress

@@ -4,9 +4,9 @@
 # Current version is working solely with backups
 progress(){
 
-    PROGRESS=$(cat /tmp/track-progress)
-    PROGRESS_TYPE=$(cat /tmp/track-progress-type)
+    PROGRESS=$(cat /tmp/backup-utils-progress)
+    PROGRESS_TYPE=$(cat /tmp/backup-utils-progress-type)
     PROGRESS_PERCENT=$( echo "scale = 2; ($PROGRESS / $PROGRESS_TOTAL) * 100" | bc)
-    echo $((PROGRESS +1)) > /tmp/track-progress
-    echo "${PROGRESS_TYPE} progress: $PROGRESS_PERCENT % ($PROGRESS / $PROGRESS_TOTAL ) $1 " > /tmp/progress-info
+    echo $((PROGRESS +1)) > /tmp/backup-utils-progress
+    echo "${PROGRESS_TYPE} progress: $PROGRESS_PERCENT % ($PROGRESS / $PROGRESS_TOTAL ) $1 " > /tmp/backup-utils-progress-info
 }