test

common.sh

@@ -11,11 +11,11 @@
 #-----------------------------------------------------------------------------------------------
 # Load Master.conf
 #-----------------------------------------------------------------------------------------------
+# Load Master.conf
 load_master_conf() {
     local script_dir
-    script_dir="$(cd "$(dirname "${BASH_SOURCE[1]}")" && pwd)"
+    script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
     local master_conf="$script_dir/../Master.conf"
-
     if [ -f "$master_conf" ]; then
         source "$master_conf"
         echo "Loaded Master.conf from $master_conf"
@@ -25,73 +25,51 @@ load_master_conf() {
     fi
 }
 
-#-----------------------------------------------------------------------------------------------
-# Parse CLI args (flags + VAR=value overrides)
-#-----------------------------------------------------------------------------------------------
+# Parse CLI arguments
 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"
             else
-                echo "Warning: Unknown variable $VAR_NAME, ignoring."
+                echo "Warning: Unknown variable $VAR_NAME"
             fi
         else
             case "$ARG" in
-                --dry-run|-n)
-                    DRY_RUN=true
-                    ;;
-                --help|-h)
-                    echo "Usage: script [--dry-run|-n] [VAR=value ...]"
-                    exit 0
-                    ;;
-                *)
-                    echo "Warning: Unknown argument $ARG"
-                    ;;
+                --dry-run|-n) DRY_RUN=true ;;
+                --help|-h) echo "Usage: script [--dry-run|-n] [VAR=value ...]"; exit 0 ;;
+                *) echo "Warning: Unknown argument $ARG" ;;
             esac
         fi
     done
 }
 
-#-----------------------------------------------------------------------------------------------
-# Validate integer (non-negative)
-#-----------------------------------------------------------------------------------------------
+# Validate integer
 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 to be set
-#-----------------------------------------------------------------------------------------------
+# Require variable
 require_var() {
     local var="$1"
-
     if [[ -z "${!var:-}" ]]; then
         echo "Error: Required variable $var is not set."
         exit 1
     fi
 }
 
-#-----------------------------------------------------------------------------------------------
-# Host + Remote + SSH Detection (RUN THIS AFTER load_master_conf)
-#-----------------------------------------------------------------------------------------------
+# Detect local hostname and set remote
 detect_remote() {
-
-    # Detect local hostname
     LOCAL_HOSTNAME="$(hostname)"
-
     if [[ "$LOCAL_HOSTNAME" == "$HOST1" ]]; then
         LOCAL_SERVER_NAME="$HOST1"
         REMOTE_SERVER_NAME="$HOST2"
@@ -102,33 +80,22 @@ detect_remote() {
         echo "Error: Local hostname ($LOCAL_HOSTNAME) not recognized."
         exit 1
     fi
-
     echo "Local server: $LOCAL_SERVER_NAME"
     echo "Remote server: $REMOTE_SERVER_NAME"
 
-    # Resolve Tailscale IP
     REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null)
-
     if [[ -z "$REMOTE_SERVER" ]]; then
         echo "Error: Could not resolve Tailscale IP for $REMOTE_SERVER_NAME"
         exit 1
     fi
-
     echo "Resolved $REMOTE_SERVER_NAME → $REMOTE_SERVER"
 
-    # SSH key mapping
-    declare -A SSH_KEYS
-    SSH_KEYS["$HOST1|$HOST2"]="/root/.ssh/Gmer4Lfe-rsync-key"
-    SSH_KEYS["$HOST2|$HOST1"]="/root/.ssh/Jayred365-rsync-key"
-
     KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME"
-
     if [[ -n "${SSH_KEYS[$KEY_ID]}" ]]; then
         SSH_KEY="${SSH_KEYS[$KEY_ID]}"
     else
         echo "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"
         exit 1
     fi
-
     echo "Using SSH key: $SSH_KEY"
 }