Harden some variable placement

Signed-off-by: Ben Clark <ben@benjyc.uk>

distributions/openhab/src/main/resources/bin/backup

@@ -95,9 +95,9 @@ setup "$1"
 ## Copy userdata and conf folders
 echo "Copying configuration to temporary folder..."
 mkdir -p "$TempDir/userdata"
-cp -a "$OPENHAB_USERDATA/"*  "$TempDir/userdata"
+cp -a "${OPENHAB_USERDATA:?}/"*  "$TempDir/userdata"
 mkdir -p "$TempDir/conf"
-cp -a "$OPENHAB_CONF/"*      "$TempDir/conf"
+cp -a "${OPENHAB_CONF:?}/"*      "$TempDir/conf"
 
 ## Remove non-transferable userdata files
 echo "Removing unnecessary files..."
@@ -123,9 +123,6 @@ if [ "$OPENHAB_BACKUPS" = "$OPENHAB_USERDATA/backups" ]; then
   rm -rf "$TempDir/userdata/backups"
 fi
 
-echo "$OPENHAB_BACKUPS"
-echo "$OPENHAB_USERDATA/backups"
-
 ## Create archive
 mkdir -p "$OPENHAB_BACKUPS"
 echo "Zipping folder..."

distributions/openhab/src/main/resources/bin/restore

@@ -114,7 +114,7 @@ echo "Any file without a replacement will be deleted."
 echo ""
 printf "Okay to Continue? [y/N]: "
 read -r answer
-case $answer in
+case "$answer" in
   [Yy]*)
     ;;
   *)
@@ -125,27 +125,50 @@ case $answer in
 esac
 
 ## Move old configuration
-echo "Deleting current configuration"
-( cd "$OPENHAB_USERDATA"
-  if [ ! -d "./jsondb" ] || [ ! -d "./etc" ]; then
-    echo "Couldn't find anything sensible in $OPENHAB_USERDATA skipping..."
-  else
-    find . -maxdepth 1 ! -name 'etc' ! -name '.' ! -name 'backups' -type d -exec rm -rf {} +
-  fi
-) || {
-  echo "Failed to delete current userdata contents." >&2
-  exit 1
-}
+mkdir -p /tmp/openhab/old
+echo "Moving system files in userdata to temporary folder"
+if [ -d "$OPENHAB_USERDATA/backups" ]; then
+  mv "$OPENHAB_USERDATA/backups" /tmp/openhab/old || {
+    echo "Could not move backup folder to temporary folder..." >&2
+    exit 1
+  }
+fi
+if [ -d "${OPENHAB_USERDATA:?}/etc" ]; then
+  mv "${OPENHAB_USERDATA:?}/etc" /tmp/openhab/old || {
+    echo "Could not move etc folder to temporary folder" >&2
+    exit 1
+  }
+fi
+
+echo "Deleting old userdata folder..."
+rm -rf "${OPENHAB_USERDATA:?}/"*
+
+echo "Restoring system files in userdata..."
+if [ -d /tmp/openhab/old/backups ]; then
+  mv /tmp/openhab/old/backups "${OPENHAB_USERDATA:?}/" || {
+    echo "Unable to move other backup files back..."
+    exit 1
+  }
+fi
+if [ -d /tmp/openhab/old/etc ]; then
+  mv /tmp/openhab/old/etc "${OPENHAB_USERDATA:?}/" || {
+    echo "Unable to move system files back..."
+    exit 1
+  }
+fi
+
+echo "Deleting old conf folder..."
 rm -rf "${OPENHAB_CONF:?}/"*
 
+
 ## Restore configuration
-echo "Moving over backup configuration"
-command cp -af "$TempDir/conf/"*     "$OPENHAB_CONF/" || {
+echo "Restoring openHAB with backup configuration..."
+command cp -af "$TempDir/conf/"*     "${OPENHAB_CONF:?}/" || {
   echo "Failed to copy $TempDir/conf/ to $OPENHAB_CONF/..." >&2
   echo "Please check $TempDir and replace conf and userdata." >&2
   exit 1
 }
-command cp -af "$TempDir/userdata/"* "$OPENHAB_USERDATA/" || {
+command cp -af "$TempDir/userdata/"* "${OPENHAB_USERDATA:?}/" || {
   echo "Failed to copy $TempDir/userdata/ to $OPENHAB_USERDATA/..." >&2
   echo "Please check $TempDir and replace userdata." >&2
   exit 1