C

common.sh

@@ -3,10 +3,11 @@
 # --------------------- Common Shared Functions for Unraid Scripts -----------------------------
 #-----------------------------------------------------------------------------------------------
 
-# Load Master.conf
+# Load Master.conf relative to calling script
 load_master_conf() {
-    # Use absolute path to avoid "not found" errors
-    local master_conf="/mnt/user/appdata/unraid_scripts/Master.conf"
+    local script_dir
+    script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    local master_conf="$script_dir/../Master.conf"
 
     if [ -f "$master_conf" ]; then
         source "$master_conf"
@@ -20,10 +21,12 @@ load_master_conf() {
 # Parse CLI args (flags + VAR=value overrides)
 parse_args() {
     DRY_RUN=${DRY_RUN:-false}
+
     for ARG in "$@"; do
         if [[ "$ARG" == *=* ]]; then
             local VAR_NAME="${ARG%%=*}"
             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"
@@ -36,7 +39,8 @@ parse_args() {
                 --help|-h)
                     echo "Usage: script [--dry-run|-n] [VAR=value ...]"
                     exit 0 ;;
-                *) echo "Warning: Unknown argument $ARG" ;;
+                *)
+                    echo "Warning: Unknown argument $ARG" ;;
             esac
         fi
     done
@@ -52,7 +56,7 @@ validate_int() {
     fi
 }
 
-# Require variable
+# Require variable to be set
 require_var() {
     local var="$1"
     if [[ -z "${!var:-}" ]]; then
@@ -61,10 +65,9 @@ require_var() {
     fi
 }
 
-# Detect local hostname
+# Detect local hostname and set remote
 detect_hosts() {
     LOCAL_HOSTNAME="$(hostname)"
-
     if [[ "$LOCAL_HOSTNAME" == "$HOST1" ]]; then
         LOCAL_SERVER_NAME="$HOST1"
         REMOTE_SERVER_NAME="$HOST2"
@@ -86,13 +89,8 @@ detect_hosts() {
     fi
     echo "Resolved $REMOTE_SERVER_NAME → $REMOTE_SERVER"
 
-    # SSH key mapping
-    if ! declare -A SSH_KEYS &>/dev/null; then
-        declare -A SSH_KEYS
-        SSH_KEYS["$HOST1|$HOST2"]="/root/.ssh/Gmer4Lfe-rsync-key"
-        SSH_KEYS["$HOST2|$HOST1"]="/root/.ssh/Jayred365-rsync-key"
-    fi
-
+    # Require SSH_KEYS
+    require_var SSH_KEYS
     KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME"
     if [[ -n "${SSH_KEYS[$KEY_ID]}" ]]; then
         SSH_KEY="${SSH_KEYS[$KEY_ID]}"