c

common.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 
 #-----------------------------------------------------------------------------------------------
-#--------------------- Common Shared Functions -------------------------------------------------
+# Common Shared Functions for Unraid Scripts
 #-----------------------------------------------------------------------------------------------
 
-# Load Master.conf
+# Load Master.conf relative to calling script
 load_master_conf() {
     local script_dir
     script_dir="$(cd "$(dirname "${BASH_SOURCE[1]}")" && pwd)"
+
     local master_conf="$script_dir/../Master.conf"
 
     if [ -f "$master_conf" ]; then
@@ -19,7 +20,7 @@ load_master_conf() {
     fi
 }
 
-# Parse CLI arguments
+# Parse CLI arguments (flags + VAR=value overrides)
 parse_args() {
     DRY_RUN=${DRY_RUN:-false}
 
@@ -29,40 +30,48 @@ parse_args() {
             local VAR_VALUE="${ARG#*=}"
 
             if declare -p "$VAR_NAME" &>/dev/null; then
-                printf -v "$VAR_NAME" '%s' "$VAR_VALUE"
-                echo "Overriding $VAR_NAME -> $VAR_VALUE"
+                if [[ "$VAR_NAME" =~ ^[A-Za-z_][A-Za-z0-9_]*$ ]]; then
+                    printf -v "$VAR_NAME" '%s' "$VAR_VALUE"
+                    echo "Overriding $VAR_NAME -> $VAR_VALUE"
+                else
+                    echo "Warning: Invalid variable name $VAR_NAME"
+                fi
             else
                 echo "Warning: Unknown variable $VAR_NAME, ignoring."
             fi
         else
             case "$ARG" in
-                --dry-run|-n) DRY_RUN=true ;;
+                --dry-run|-n)
+                    DRY_RUN=true
+                    ;;
                 --help|-h)
                     echo "Usage: script [--dry-run|-n] [VAR=value ...]"
-                    exit 0 ;;
+                    exit 0
+                    ;;
                 *)
-                    echo "Warning: Unknown argument $ARG" ;;
+                    echo "Warning: Unknown argument $ARG"
+                    ;;
             esac
         fi
     done
 }
 
-# Validate integer
+# Validate integer (non-negative)
 validate_int() {
     local name="$1"
     local value="$2"
+
     if ! [[ "${value:-}" =~ ^[0-9]+$ ]]; then
         echo "Error: $name must be a non-negative integer."
         exit 1
     fi
 }
 
-# Require variable
+# Optional: require variable to be set
 require_var() {
     local var="$1"
     if [[ -z "${!var:-}" ]]; then
         echo "Error: Required variable $var is not set."
         exit 1
     fi
-}
-
+}