bug fix in common.sh

common.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
+# -----------------------------------------------------------------------------------------------
+# ----------------- UNRAID OPS COMMON LIBRARY (STABLE FRAMEWORK v1) -----------------------
+# -----------------------------------------------------------------------------------------------
 
-# ---------------- ICONS ----------------
+# ICONS Profiles
 ICON_INFO="ℹ️"
 ICON_WARN="⚠️"
 ICON_ERROR="❌"
@@ -11,13 +14,17 @@ ICON_RETRY="🔁"
 ICON_SYNC="🔄"
 ICON_GEAR="⚙️"
 
+# OUTPUT
 info() { echo "$ICON_INFO [INFO] $*"; }
 warn() { echo "$ICON_WARN [WARN] $*"; }
 error() { echo "$ICON_ERROR [ERROR] $*"; }
 success() { echo "$ICON_SUCCESS [OK] $*"; }
-log() { [[ "${ENABLE_LOGGING:-false}" == true ]] && echo "[LOG] $*"; }
 
-# ---------------- ARG PARSER ----------------
+log() {
+    [[ "${ENABLE_LOGGING:-false}" == true ]] && echo "[LOG] $*"
+}
+
+# ARG PARSER
 parse_args() {
     ENABLE_LOGGING=${ENABLE_LOGGING:-false}
     DRY_RUN=${DRY_RUN:-false}
@@ -26,23 +33,48 @@ parse_args() {
     CLEAN_ARGS=()
 
     for ARG in "$@"; do
-        case "$ARG" in
+        if [[ "$ARG" == *=* ]]; then
-            --dry-run|-n) DRY_RUN=true ;;
+            VAR="${ARG%%=*}"
-            --log) ENABLE_LOGGING=true ;;
+            VAL="${ARG#*=}"
-            --no-log) ENABLE_LOGGING=false ;;
+
-            --status|--summary) SHOW_STATUS=true ;;
+            case "$VAR" in
-            *) CLEAN_ARGS+=("$ARG") ;;
+                LOG)
-        esac
+                    [[ "$VAL" == "true" ]] && ENABLE_LOGGING=true
+                    [[ "$VAL" == "false" ]] && ENABLE_LOGGING=false
+                    ;;
+                *)
+                    if declare -p "$VAR" &>/dev/null; then
+                        printf -v "$VAR" '%s' "$VAL"
+                        log "Set $VAR=$VAL"
+                    else
+                        warn "Unknown variable: $VAR"
+                    fi
+                    ;;
+            esac
+        else
+            case "$ARG" in
+                --dry-run|-n) DRY_RUN=true ;;
+                --log) ENABLE_LOGGING=true ;;
+                --no-log) ENABLE_LOGGING=false ;;
+                --status|--summary) SHOW_STATUS=true ;;
+                --help|-h)
+                    echo "Usage: script <dir> [--dry-run] [--log]"
+                    exit 0
+                    ;;
+                *) CLEAN_ARGS+=("$ARG") ;;
+            esac
+        fi
     done
 
     PARSED_ARGS=("${CLEAN_ARGS[@]}")
 }
 
+# VALIDATION
 require_var() {
     [[ -z "${!1:-}" ]] && error "Missing required: $1" && exit 1
 }
 
-# ---------------- HOST DETECTION ----------------
+# HOST DETECTION
 detect_hosts() {
     LOCAL_HOSTNAME="$(hostname)"
 
@@ -68,24 +100,27 @@ detect_hosts() {
     info "Host: $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"
 }
 
+# REMOTE
 resolve_remote_ip() {
+    log "Resolving remote IP..."
     REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null)
+
     [[ -z "$REMOTE_SERVER" ]] && error "Failed to resolve remote IP" && exit 1
+
     info "Remote IP: $REMOTE_SERVER"
 }
 
-# ---------------- CONTAINERS (FIXED) ----------------
+# CONTAINERS
 RUNNING_CONTAINERS=()
 
 stop_containers() {
-    [[ -z "${CRITICAL_CONTAINER_NAMES:-}" ]] && return
+    [[ ${#CRITICAL_CONTAINER_NAMES[@]} -eq 0 ]] && return
-
-    read -r -a containers <<< "${CRITICAL_CONTAINER_NAMES}"
 
     info "Stopping containers..."
+    RUNNING_CONTAINERS=()
 
-    for c in "${containers[@]}"; do
+    for c in "${CRITICAL_CONTAINER_NAMES[@]}"; do
-        [[ -z "$c" ]] && continue
+        info "Checking container: $c"
 
         STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" \
             "docker inspect -f '{{.State.Running}}' $c 2>/dev/null" || echo "false")
@@ -100,7 +135,7 @@ stop_containers() {
                 error "Failed to stop $c"
             fi
         else
-            success "$c already stopped"
+            log "$c already stopped"
         fi
     done
 }
@@ -111,6 +146,8 @@ start_containers() {
     info "Starting containers..."
 
     for c in "${RUNNING_CONTAINERS[@]}"; do
+        info "Starting $c"
+
         if ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker start $c" >/dev/null; then
             success "$c started"
         else
@@ -119,14 +156,19 @@ start_containers() {
     done
 }
 
-# ---------------- RSYNC LIMIT ----------------
+# RSYNC LIMITER
 wait_for_rsync() {
     : "${RETRY_COUNT:=5}"
     : "${MAX_RSYNC_PROCS:=2}"
     : "${SLEEP:=2}"
 
     for i in $(seq 1 "$RETRY_COUNT"); do
-        COUNT=$(pgrep -fc "rsync" || true)
+
+        COUNT=$(ps -eo pid,cmd | grep "[r]sync .*${REMOTE_SERVER:-}" | wc -l || true)
+
+        if [[ -z "$REMOTE_SERVER" ]]; then
+            COUNT=$(pgrep -x rsync | wc -l || true)
+        fi
 
         if [[ "$COUNT" -ge "$MAX_RSYNC_PROCS" ]]; then
             warn "Waiting rsync slot ($COUNT/$MAX_RSYNC_PROCS)"
@@ -140,7 +182,7 @@ wait_for_rsync() {
     exit 1
 }
 
-# ---------------- RSYNC OPTS ----------------
+# RSYNC OPTIONS
 get_rsync_opts() {
     if [[ -n "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]:-}" ]]; then
         read -r -a RSYNC_OPTS <<< "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]}"
@@ -149,11 +191,14 @@ get_rsync_opts() {
     fi
 }
 
+# STATUS
 show_status() {
     echo "===== STATUS ====="
     echo "Local:   $LOCAL_SERVER_NAME"
     echo "Remote:  $REMOTE_SERVER_NAME"
     echo "IP:      $REMOTE_SERVER"
     echo "Profile: $PROFILE_NAME"
+    echo "DryRun:  $DRY_RUN"
+    echo "Logging: $ENABLE_LOGGING"
     echo "=================="
 }