allow backups on gheboot for testing

Author: ddivad195

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

@@ -372,13 +372,13 @@ export GHE_DATA_DIR
 : "${GHE_RELEASE_FILE:="/etc/github/enterprise-release"}"
 
 # Check that utils are not being run directly on GHE appliance.
-if [ -f "$GHE_RELEASE_FILE" ]; then
-  echo "Error: Backup Utils cannot be run on the GitHub Enterprise host." 1>&2
-  echo "       The backup utilities should be run on a host dedicated to" 1>&2
-  echo "       long-term permanent storage and must have network connectivity" 1>&2
-  echo "       with the GitHub Enterprise appliance." 1>&2
-  exit 1
-fi
+# if [ -f "$GHE_RELEASE_FILE" ]; then
+#   echo "Error: Backup Utils cannot be run on the GitHub Enterprise host." 1>&2
+#   echo "       The backup utilities should be run on a host dedicated to" 1>&2
+#   echo "       long-term permanent storage and must have network connectivity" 1>&2
+#   echo "       with the GitHub Enterprise appliance." 1>&2
+#   exit 1
+# fi
 
 GHE_CREATE_DATA_DIR=${GHE_CREATE_DATA_DIR:-yes}
 

share/github-backup-utils/ghe-restore-actions

@@ -92,6 +92,16 @@ restore-secret "Actions Launch token oauth cert" "actions-oauth-s2s-signing-cert
 if $RESTORE_SETTINGS; then
   restore-secret "Actions storage container prefix" "actions-storage-container-prefix" "secrets.actions.storage.container-prefix"
 fi
+# Restore storage container prefix, but only if the `-c` option is used with ghe-restore to avoid staging instances using production bucket settings
+# This value will only be present in backups from versions >= 3.10 so needs to be wrapped in version checks.
+# if [ -n "$GHE_RESTORE_SNAPSHOT_PATH" ]; then
+#   snapshot_version=$(cat $GHE_RESTORE_SNAPSHOT_PATH/version)
+#   # shellcheck disable=SC2046 # Word splitting is required to populate the variables
+#   read -r snapshot_version_major snapshot_version_minor _ <<<$(ghe_parse_version $snapshot_version)
+#   if [ "$(version $snapshot_version_major.$snapshot_version_minor.0)" -a $RESTORE_SETTINGS ]; then
+#     restore-secret "Actions storage container prefix" "actions-storage-container-prefix" "secrets.actions.storage.container-prefix"
+#   fi
+# fi
 
 # Setup the database logins.
 ghe_verbose "* Restoring database logins and users to $host ..."

share/github-backup-utils/track-progress

@@ -7,7 +7,7 @@ progress(){
 
     PROGRESS=$(cat /tmp/backup-utils-progress)
     PROGRESS_TYPE=$(cat /tmp/backup-utils-progress-type)
-    PROGRESS_PERCENT=$( echo "scale = 2; ($PROGRESS / $PROGRESS_TOTAL) * 100" | bc)
+    PROGRESS_PERCENT=$( echo "scale = 2; ($PROGRESS / $PROGRESS_TOTAL) * 100")
     echo $((PROGRESS +1)) > /tmp/backup-utils-progress
     echo "${PROGRESS_TYPE} progress: $PROGRESS_PERCENT % ($PROGRESS / $PROGRESS_TOTAL ) $1 " > /tmp/backup-utils-progress-info
 }