cleanup from review

Author: chuckp22

bin/ghe-backup

@@ -123,7 +123,7 @@ ghe_restore_check
 if [ -h ../in-progress ]; then
   echo "Error: detected a backup already in progress from a previous version of ghe-backup." 1>&2
   echo "If there is no backup in progress anymore, please remove" 1>&2
-  echo "the \"$GHE_DATA_DIR/in-progress\" file and try again." 1>&2
+  echo "the $GHE_DATA_DIR/in-progress file and try again." 1>&2
   exit 1
 fi
 
@@ -139,12 +139,13 @@ if [ -f ../in-progress ]; then
     echo "Error: A backup of $GHE_HOSTNAME may still be running on PID $pid." 1>&2
     echo 1>&2
     echo "  If PID $pid is not a process related to the backup utilities, please remove" 1>&2
-    echo "  the \"$GHE_DATA_DIR/in-progress\" file and try again." 1>&2
+    echo "  the $GHE_DATA_DIR/in-progress file and try again." 1>&2
     exit 1
   fi
 fi
 
 echo "$GHE_SNAPSHOT_TIMESTAMP $$" > ../in-progress
+echo "$GHE_SNAPSHOT_TIMESTAMP $$" > ${GHE_DATA_DIR}/in-progress-backup
 
 echo "Starting backup of $GHE_HOSTNAME with backup-utils v$BACKUP_UTILS_VERSION in snapshot $GHE_SNAPSHOT_TIMESTAMP"
 
@@ -279,3 +280,6 @@ ghe-detect-leaked-ssh-keys -s "$GHE_SNAPSHOT_DIR" || true
 
 # Make sure we exit zero after the conditional
 true
+
+# Remove in-progress file
+ghe_backup_finished

bin/ghe-restore

@@ -154,7 +154,8 @@ cleanup_cluster_nodes() {
 # Check to make sure moreutils parallel is installed and working properly
 ghe_parallel_check
 
-# ghe_restore_check
+# Check to make sure another restore process is not running
+ghe_restore_check
 
 # Grab the host arg
 GHE_HOSTNAME="${GHE_RESTORE_HOST_OPT:-$GHE_RESTORE_HOST}"
@@ -174,6 +175,7 @@ GHE_RESTORE_SNAPSHOT_PATH="$(ghe-restore-snapshot-path "$snapshot_id")"
 GHE_RESTORE_SNAPSHOT=$(basename "$GHE_RESTORE_SNAPSHOT_PATH")
 export GHE_RESTORE_SNAPSHOT
 
+# Check to make sure backup is not running
 ghe_backup_check
 
 # Detect if the backup we are restoring has a leaked ssh key
@@ -587,7 +589,7 @@ echo 'End time:' $END_TIME
 echo 'Runtime:' $(($END_TIME - $START_TIME)) 'seconds'
 
 echo "Restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT finished."
-rm -f ${GHE_DATA_DIR}/in-progress-restore
+ghe_restore_finished
 
 if ! $instance_configured; then
   echo "To complete the restore process, please visit https://$hostname/setup/settings to review and save the appliance configuration."

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

@@ -75,7 +75,7 @@ ghe_restore_check() {
   if [ -h $GHE_RESTORE_IN_PROGRESS ]; then
     echo "  Error: detected a restore already in progress from a previous version of ghe-restore." 1>&2
     echo "  If there is no restore in progress anymore, please remove" 1>&2
-    echo "  the \"$GHE_RESTORE_IN_PROGRESS\" file and try again." 1>&2
+    echo "  the $GHE_RESTORE_IN_PROGRESS file and try again." 1>&2
     exit 1
   fi
 
@@ -85,7 +85,7 @@ ghe_restore_check() {
     pid=$(echo "$progress" | cut -d ' ' -f 2)
     echo "  Error: A restore of $GHE_HOSTNAME may still be running on PID $pid." 1>&2
     echo "  If PID $pid is not a process related to the restore utilities, please remove" 1>&2
-    echo "  the \"$GHE_RESTORE_IN_PROGRESS\" file and try again." 1>&2
+    echo "  the $GHE_RESTORE_IN_PROGRESS file and try again." 1>&2
     exit 1
   fi
 }
@@ -94,7 +94,7 @@ ghe_backup_check() {
   if [ -h $GHE_BACKUP_IN_PROGRESS ]; then
     echo "  Error: detected a backup already in progress from a previous version of ghe-backup." 1>&2
     echo "  If there is no backup in progress anymore, please remove" 1>&2
-    echo "  the \"$GHE_DATA_DIR/i$GHE_BACKUP_IN_PROGRESS\" file and try again." 1>&2
+    echo "  the $GHE_DATA_DIR/$GHE_BACKUP_IN_PROGRESS file and try again." 1>&2
     exit 1
   fi
 
@@ -104,23 +104,21 @@ ghe_backup_check() {
     pid=$(echo "$progress" | cut -d ' ' -f 2)
     echo "  Error: A backup of $GHE_HOSTNAME may still be running on PID $pid." 1>&2
     echo "  If PID $pid is not a process related to the backup utilities, please remove" 1>&2
-    echo "  the \"$GHE_BACKUP_IN_PROGRESS\" file and try again." 1>&2
+    echo "  the $GHE_BACKUP_IN_PROGRESS file and try again." 1>&2
     exit 1
   fi
 }
 
 ghe_restore_finished() {
-	echo "$GHE_RESTORE_IN_PROGRESS"
-	if [ -f $GHE_RESTORE_IN_PROGRESS ]; then
-		echo "$GHE_RESTORE_IN_PROGRESS exists!" 1>&2
-		rm -f $GHE_RESTORE_IN_PROGRESS
-	fi
+  if [ -f $GHE_RESTORE_IN_PROGRESS ]; then
+    rm -f $GHE_RESTORE_IN_PROGRESS
+  fi
 }
 
 ghe_backup_finished() {
-	if [ -f $GHE_BACKUP_IN_PROGRESS ]; then
-		rm -f $GHE_BACKUP_IN_PROGRESS
-	fi
+  if [ -f $GHE_BACKUP_IN_PROGRESS ]; then
+    rm -f $GHE_BACKUP_IN_PROGRESS
+  fi
 }
 
 ghe_parallel_check() {