making adjustments

Author: gamefiend

bin/ghe-restore

@@ -289,7 +289,7 @@ fi
 if ghe-ssh "$GHE_HOSTNAME" -- 'ghe-config --true app.minio.enabled'; then
   OPTIONAL_STEPS=$((OPTIONAL_STEPS + 1))
 fi
-# Elasticsearch is optional for cluster restores
+# Restoring Elasticsearch 
 if ! $CLUSTER && [ -d "$GHE_RESTORE_SNAPSHOT_PATH/elasticsearch" ]; then
   OPTIONAL_STEPS=$((OPTIONAL_STEPS + 1))
 fi
@@ -304,7 +304,7 @@ if ! $CLUSTER && $instance_configured; then
   OPTIONAL_STEPS=$((OPTIONAL_STEPS + 1))
 fi
 # Maximum restore steps
-export PROGRESS_TOTAL=$((OPTIONAL_STEPS + 9))
+export PROGRESS_TOTAL=$((OPTIONAL_STEPS + 5))
 
 init-progress
 export PROGRESS_TYPE="Restore"

share/github-backup-utils/track-progress

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