Refactor shell scripts for style and robustness

Standardized spacing and formatting in restore.sh for improved readability. Enhanced test_restore.sh with safer directory changes and consistent heredoc formatting. These changes improve code clarity and reliability without altering core functionality.

Author: supermarsx

restore.sh

@@ -20,7 +20,7 @@
 #
 # Author: supermarsx
 # Repository: https://github.com/supermarsx/opencore-restore
-# License: MIT 
+# License: MIT
 #
 # ==============================================================================
 
@@ -46,16 +46,16 @@ NC=$(printf '\033[0m') # No Color
 # Helper functions to print standardized status messages.
 
 # log_info: Prints an informational message in blue.
-log_info()    { printf "${BLUE}[INFO]${NC} %s\n" "$1"; }
+log_info() { printf "${BLUE}[INFO]${NC} %s\n" "$1"; }
 
 # log_success: Prints a success message in green.
 log_success() { printf "${GREEN}[ OK ]${NC} %s\n" "$1"; }
 
 # log_warn: Prints a warning message in yellow.
-log_warn()    { printf "${YELLOW}[WARN]${NC} %s\n" "$1"; }
+log_warn() { printf "${YELLOW}[WARN]${NC} %s\n" "$1"; }
 
 # log_error: Prints an error message in red.
-log_error()   { printf "${RED}[FAIL]${NC} %s\n" "$1"; }
+log_error() { printf "${RED}[FAIL]${NC} %s\n" "$1"; }
 
 # header: Clears the screen and prints the script banner.
 header() {
@@ -111,16 +111,16 @@ else
         # Note: diskutil info might fail in minimal sh environments, but usually present in Recovery.
         NODE_INFO=$(diskutil info "$disk" | grep "Device Node" | awk '{print $3}')
         printf "  [%d] ${YELLOW}%s${NC} (%s)\n" "$i" "$disk" "$NODE_INFO"
-        i=$((i+1))
+        i=$((i + 1))
     done
 
     printf "\n"
-    printf "Select partition number [0-$((COUNT-1))]: "
+    printf "Select partition number [0-$((COUNT - 1))]: "
     read -r SELECTION
 
     # Validate selection is a number
     case "$SELECTION" in
-        ''|*[!0-9]*) 
+        '' | *[!0-9]*)
             log_error "Invalid selection."
             exit 1 
             ;;
@@ -138,7 +138,7 @@ else
             TARGET_DISK=$disk
             break
         fi
-        i=$((i+1))
+        i=$((i + 1))
     done
 fi
 
@@ -236,6 +236,7 @@ printf "Please perform a COLD BOOT (Power button) after shutdown.\n"
 printf "\n"
 printf "Press Enter to clear NVRAM and Shutdown..."
 read -r DUMMY
+: "$DUMMY"
 
 log_info "Clearing NVRAM..."
 nvram -c

tests/test_restore.sh

@@ -15,7 +15,7 @@
 # ==============================================================================
 
 # Ensure we are running from the tests directory
-cd "$(dirname "$0")"
+cd "$(dirname "$0")" || exit 1
 
 # --- Setup Mock Environment ---
 TEST_DIR="./test_env"
@@ -41,7 +41,7 @@ export PATH="$PWD/$MOCK_BIN:$PATH"
 # --- Mock Commands ---
 
 # Mock diskutil
-cat << 'EOF' > "$MOCK_BIN/diskutil"
+cat <<'EOF' >"$MOCK_BIN/diskutil"
 #!/bin/sh
 if [ "$1" = "list" ]; then
     echo "/dev/disk0 (GUID Partition Scheme)"
@@ -59,21 +59,21 @@ chmod +x "$MOCK_BIN/diskutil"
 
 # Mock mount (for check)
 # Will be overwritten later with correct path
-cat << 'EOF' > "$MOCK_BIN/mount"
+cat <<'EOF' >"$MOCK_BIN/mount"
 #!/bin/sh
 echo "mount mock"
 EOF
 chmod +x "$MOCK_BIN/mount"
 
 # Mock nvram
-cat << 'EOF' > "$MOCK_BIN/nvram"
+cat <<'EOF' >"$MOCK_BIN/nvram"
 #!/bin/sh
 echo "nvram: clearing..."
 EOF
 chmod +x "$MOCK_BIN/nvram"
 
 # Mock shutdown
-cat << 'EOF' > "$MOCK_BIN/shutdown"
+cat <<'EOF' >"$MOCK_BIN/shutdown"
 #!/bin/sh
 echo "shutdown: system halting..."
 EOF
@@ -112,27 +112,27 @@ RUNTIME_MOCK_VOLUMES="./Volumes"
 # Replace /Volumes/EFI with our mock path
 # Use | as delimiter to avoid escaping slashes
 # We replace the whole line to be safe
-sed "s|EFI_MOUNT_POINT=\"/Volumes/EFI\"|EFI_MOUNT_POINT=\"$RUNTIME_MOCK_VOLUMES/EFI\"|g" "$TEST_DIR/restore.sh" > "$TEST_DIR/restore.sh.tmp"
+sed "s|EFI_MOUNT_POINT=\"/Volumes/EFI\"|EFI_MOUNT_POINT=\"$RUNTIME_MOCK_VOLUMES/EFI\"|g" "$TEST_DIR/restore.sh" >"$TEST_DIR/restore.sh.tmp"
 mv "$TEST_DIR/restore.sh.tmp" "$TEST_DIR/restore.sh"
 
 # Replace /Volumes/EFI_BACKUP with our mock path
 # We replace the whole line prefix
-sed "s|BACKUP_DIR=\"/Volumes/EFI_BACKUP_|BACKUP_DIR=\"$RUNTIME_MOCK_VOLUMES/EFI_BACKUP_|g" "$TEST_DIR/restore.sh" > "$TEST_DIR/restore.sh.tmp"
+sed "s|BACKUP_DIR=\"/Volumes/EFI_BACKUP_|BACKUP_DIR=\"$RUNTIME_MOCK_VOLUMES/EFI_BACKUP_|g" "$TEST_DIR/restore.sh" >"$TEST_DIR/restore.sh.tmp"
 mv "$TEST_DIR/restore.sh.tmp" "$TEST_DIR/restore.sh"
 
 chmod +x "$TEST_DIR/restore.sh"
 
 # Also update the mock mount script to return the path relative to CWD or absolute
 # Since we are inside TEST_DIR, ./Volumes/EFI is correct.
-cat << EOF > "$MOCK_BIN/mount"
+cat <<EOF >"$MOCK_BIN/mount"
 #!/bin/sh
 echo "/dev/disk0s1 on $RUNTIME_MOCK_VOLUMES/EFI (msdos, local, nodev, nosuid, noowners)"
 EOF
 chmod +x "$MOCK_BIN/mount"
 
 # Run the script
 # We pipe "y" to confirm the prompt, and "enter" for the final prompt
-cd "$TEST_DIR"
+cd "$TEST_DIR" || exit 1
 printf "y\n\n" | ./restore.sh
 
 EXIT_CODE=$?