test

Rsync/rsync.sh

@@ -8,12 +8,14 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../common.sh"
 
-# Load config FIRST
+# Load config
 load_master_conf
+
+# Detect hosts / SSH / Tailscale
 detect_remote
 
 #----------------------------------------------------------
-# Input Arguments (MUST come before parse_args)
+# Input Arguments
 #----------------------------------------------------------
 DIRECTORY="$1"
 if [[ -z "$DIRECTORY" ]]; then
@@ -22,38 +24,50 @@ if [[ -z "$DIRECTORY" ]]; then
 fi
 shift
 
-#----------------------------------------------------------
-# Parse CLI args AFTER shifting directory
-#----------------------------------------------------------
+# Parse CLI args
 parse_args "$@"
 
 #----------------------------------------------------------
-# At this point, common.sh has already:
-# - LOCAL_SERVER_NAME
-# - REMOTE_SERVER_NAME
-# - REMOTE_SERVER
-# - SSH_KEY
+# Profile Detection (FIXED)
 #----------------------------------------------------------
+DIR_CLEAN="${DIRECTORY%/}"
+PROFILE_NAME=$(basename "$DIR_CLEAN" | tr '[:upper:]' '[:lower:]')
 
-# Determine profile
-PROFILE_NAME=$(basename "$DIRECTORY" | tr '[:upper:]' '[:lower:]')
 echo "Detected profile: $PROFILE_NAME"
 
-# Apply profile defaults (safe fallbacks)
+# Debug (remove later if you want)
+echo "DEBUG: DIRECTORY=$DIRECTORY"
+echo "DEBUG: DIR_CLEAN=$DIR_CLEAN"
+echo "DEBUG: PROFILE_NAME=$PROFILE_NAME"
+echo "DEBUG: Available profiles: ${!PROFILE_MAX_PROCS[@]}"
+
+#----------------------------------------------------------
+# Apply profile overrides (SAFE)
+#----------------------------------------------------------
+
+# Scalars (safe fallback)
 MAX_RSYNC_PROCS=${PROFILE_MAX_PROCS[$PROFILE_NAME]:-$MAX_RSYNC_PROCS}
 BW_LIMIT=${PROFILE_BW_LIMIT[$PROFILE_NAME]:-$BW_LIMIT}
-
-# Convert string → array safely
-IFS=' ' read -r -a CRITICAL_CONTAINER_NAMES <<< "${PROFILE_CRITICAL_CONTAINER_NAMES[$PROFILE_NAME]}"
-IFS=' ' read -r -a DELAYED_CONTAINERS <<< "${PROFILE_DELAYED_CONTAINERS[$PROFILE_NAME]}"
-
 CONTAINER_DELAY=${PROFILE_CONTAINER_DELAY[$PROFILE_NAME]:-$CONTAINER_DELAY}
 RETRY_COUNT=${PROFILE_RETRY_COUNT[$PROFILE_NAME]:-$RETRY_COUNT}
 SLEEP=${PROFILE_SLEEP[$PROFILE_NAME]:-$SLEEP}
 
-IFS=' ' read -r -a EXCLUDE_DIRS <<< "${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]:-${EXCLUDE_DIRS[*]}}"
+# Arrays (ONLY override if profile exists)
+if [[ -n "${PROFILE_CRITICAL_CONTAINER_NAMES[$PROFILE_NAME]}" ]]; then
+    IFS=' ' read -r -a CRITICAL_CONTAINER_NAMES <<< "${PROFILE_CRITICAL_CONTAINER_NAMES[$PROFILE_NAME]}"
+fi
 
-# Validate numeric variables
+if [[ -n "${PROFILE_DELAYED_CONTAINERS[$PROFILE_NAME]}" ]]; then
+    IFS=' ' read -r -a DELAYED_CONTAINERS <<< "${PROFILE_DELAYED_CONTAINERS[$PROFILE_NAME]}"
+fi
+
+if [[ -n "${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]}" ]]; then
+    IFS=' ' read -r -a EXCLUDE_DIRS <<< "${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]}"
+fi
+
+#----------------------------------------------------------
+# Validate
+#----------------------------------------------------------
 validate_int MAX_RSYNC_PROCS "$MAX_RSYNC_PROCS"
 validate_int BW_LIMIT "$BW_LIMIT"
 validate_int CONTAINER_DELAY "$CONTAINER_DELAY"
@@ -66,7 +80,9 @@ echo "  BW_LIMIT=$BW_LIMIT"
 echo "  CONTAINERS=${CRITICAL_CONTAINER_NAMES[*]}"
 echo "  EXCLUDES=${EXCLUDE_DIRS[*]}"
 
+#----------------------------------------------------------
 # Dependency check
+#----------------------------------------------------------
 for cmd in rsync ssh ping timeout docker tailscale; do
     command -v "$cmd" >/dev/null 2>&1 || {
         echo "Error: Required command '$cmd' is not installed."
@@ -112,11 +128,11 @@ stop_containers() {
         STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" \
             "docker inspect -f '{{.State.Running}}' $container 2>/dev/null" || echo "false")
 
-        if [ "$STATUS" == "true" ]; then
+        if [[ "$STATUS" == "true" ]]; then
             echo "Stopping $container"
             RUNNING_CONTAINERS+=("$container")
 
-            if [ "$DRY_RUN" = true ]; then
+            if [[ "$DRY_RUN" == true ]]; then
                 echo "[DRY-RUN] Would stop container $container"
             else
                 ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker stop $container"
@@ -131,10 +147,10 @@ start_containers() {
     for container in "${RUNNING_CONTAINERS[@]}"; do
         if [[ " ${DELAYED_CONTAINERS[*]} " == *" $container "* ]]; then
             echo "Delaying start of $container by ${CONTAINER_DELAY}s..."
-            [ "$DRY_RUN" = false ] && sleep "$CONTAINER_DELAY"
+            [[ "$DRY_RUN" == false ]] && sleep "$CONTAINER_DELAY"
         fi
 
-        if [ "$DRY_RUN" = true ]; then
+        if [[ "$DRY_RUN" == true ]]; then
             echo "[DRY-RUN] Would start container $container"
         else
             ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker start $container"
@@ -174,10 +190,10 @@ main() {
     )
 
     for pattern in "${EXCLUDE_DIRS[@]}"; do
-        [ -n "$pattern" ] && RSYNC_OPTS+=(--exclude="$pattern")
+        [[ -n "$pattern" ]] && RSYNC_OPTS+=(--exclude="$pattern")
     done
 
-    [ "$DRY_RUN" = true ] && RSYNC_OPTS+=("--dry-run")
+    [[ "$DRY_RUN" == true ]] && RSYNC_OPTS+=("--dry-run")
 
     for attempt in $(seq 1 "$RETRY_COUNT"); do
         echo "Starting rsync attempt $attempt/$RETRY_COUNT..."
@@ -192,7 +208,7 @@ main() {
         else
             echo "Rsync attempt $attempt failed."
 
-            if [ "$attempt" -lt "$RETRY_COUNT" ]; then
+            if [[ "$attempt" -lt "$RETRY_COUNT" ]]; then
                 echo "Retrying in $SLEEP seconds..."
                 sleep "$SLEEP"
             else