This commit is contained in:
2026-03-27 18:50:59 +00:00
parent cf89d6c3ca
commit 098dc84585
+5 -17
View File
@@ -20,23 +20,11 @@ set -euo pipefail
BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# -----------------------------------------------------------------------------
# Self-healing config loader (OPTION C)
# -----------------------------------------------------------------------------
if [[ -f "$BASE_DIR/../common.sh" ]]; then
# normal layout: Rsync/ + shared root files
source "$BASE_DIR/../Master.conf"
source "$BASE_DIR/../common.sh"
elif [[ -f "$BASE_DIR/common.sh" ]]; then
# flat layout: everything inside Rsync/
source "$BASE_DIR/Master.conf"
source "$BASE_DIR/common.sh"
else
echo "️ [INFO] Host: $(hostname)"
echo "❌ [ERROR] common.sh and Master.conf not found in expected locations"
echo "️ [INFO] BASE_DIR = $BASE_DIR"
exit 1
fi
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# Load configs & helpers
source "$SCRIPT_DIR/../Master.conf"
source "$SCRIPT_DIR/../common.sh"
# -----------------------------------------------------------------------------
# Load shared helpers (if your common.sh provides these)