Merge pull request #449 from github/taz/fix-settings-restore-and-attributes

- restoring to an un-configured appliance fails due to a missing license file
- subsequent arguments are ignored if the hostname of the restore target is specified first

Author: taz

bin/ghe-restore

@@ -62,7 +62,12 @@ while true; do
       exit 1
       ;;
     *)
-      break
+      if [ -n "$1" ]; then
+        GHE_RESTORE_HOST="$1"
+        shift
+      else
+        break
+      fi
       ;;
   esac
 done
@@ -81,7 +86,7 @@ cleanup () {
 . "$( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config"
 
 # Grab the host arg
-GHE_HOSTNAME="${1:-$GHE_RESTORE_HOST}"
+GHE_HOSTNAME="$GHE_RESTORE_HOST"
 
 # Hostname without any port suffix
 hostname=$(echo "$GHE_HOSTNAME" | cut -f 1 -d :)

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

@@ -25,15 +25,15 @@ ghe_remote_version_required "$GHE_HOSTNAME"
 # Path to snapshot dir we're restoring from
 GHE_RESTORE_SNAPSHOT_PATH="$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT"
 
+echo "Restoring license ..."
+ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-license' < "$GHE_RESTORE_SNAPSHOT_PATH/enterprise.ghl" 1>&3
+
 echo "Restoring settings ..."
 # work around issue importing settings with bad storage mode values
 ( cat "$GHE_RESTORE_SNAPSHOT_PATH/settings.json" && echo ) |
   sed 's/"storage_mode": "device"/"storage_mode": "rootfs"/' |
   ghe-ssh "$GHE_HOSTNAME" -- '/usr/bin/env GHEBUVER=2 ghe-import-settings' 1>&3
 
-echo "Restoring license ..."
-ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-license' < "$GHE_RESTORE_SNAPSHOT_PATH/enterprise.ghl" 1>&3
-
 # Restore management console password hash if present.
 if [ -f "$GHE_RESTORE_SNAPSHOT_PATH/manage-password" ]; then
   echo "Restoring management console password ..."