Fixing issues with parallel operations

Author: gamefiend

bin/ghe-restore

@@ -505,9 +505,7 @@ fi
 cmd_title=$(log_info "Restoring Redis database ...")
 commands=("
 echo \"$cmd_title\"
-bm_start \"$(basename $0) - Restoring Redis\"
-ghe-ssh \"$GHE_HOSTNAME\" -- 'ghe-import-redis' < \"$GHE_RESTORE_SNAPSHOT_PATH/redis.rdb\" 1>&3
-bm_end  \"$(basename $0) - Restoring Redis\"")
+ghe-restore-redis \"$GHE_HOSTNAME\")
 
 cmd_title=$(log_info "Restoring Git Repositories ...")
 commands+=("
@@ -527,9 +525,7 @@ ghe-restore-pages \"$GHE_HOSTNAME\" 1>&3")
 cmd_title=$(log_info "Restoring SSH authorized keys ...")
 commands+=("
 echo \"$cmd_title\"
-bm_start \"$(basename $0) -Restoring SSH authorized keys\"
-ghe-ssh \"$GHE_HOSTNAME\" -- 'ghe-import-authorized-keys' < \"$GHE_RESTORE_SNAPSHOT_PATH/authorized-keys.json\" 1>&3
-bm_end \"$(basename $0) -Restoring SSH authorized keys\"")
+ghe-restore-ssh-keys \"$GHE_HOSTNAME\" \"$GHE_RESTORE_SNAPSHOT_PATH\")
 
 cmd_title=$(log_info "Restoring storage data ...")
 commands+=("

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

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-redis <host>
+#/ Restore redis files from an rsync snapshot.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command.
+set -e
+
+# Bring in the backup configuration
+# shellcheck source=share/github-backup-utils/ghe-backup-config
+. "$(dirname "${BASH_SOURCE[0]}")/ghe-backup-config"
+
+# Show usage and bail with no arguments
+[[ -z ${*} ]] && print_usage
+
+# Grab host arg
+GHE_HOSTNAME="${1}"
+
+bm_start "$(basename "${0}")"
+
+ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-redis' < "$GHE_RESTORE_SNAPSHOT_PATH/redis.rdb" 1>&3
+
+bm_end "$(basename "${0}")"

share/github-backup-utils/ghe-restore-ssh-keys

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-ssh-keys <host>
+#/ Restore ssh keys from an rsync snapshot.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command.
+set -e
+
+# Bring in the backup configuration
+# shellcheck source=share/github-backup-utils/ghe-backup-config
+. "$(dirname "${BASH_SOURCE[0]}")/ghe-backup-config"
+
+# Show usage and bail with no arguments
+[[ -z ${*} ]] && print_usage
+
+bm_start "$(basename "${0}")"
+
+# Grab host arg
+GHE_HOSTNAME="${1}"
+GHE_RESTORE_SNAPSHOT_PATH="${2}"
+
+bm_start "$(basename "${0}")"
+
+ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-authorized-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/authorized-keys.json" 1>&3
+
+bm_end "$(basename "${0}")"