fix: repair script paths after reorg

2026-01-13 00:58:34 +00:00 · 2025-11-09 03:41:44 -05:00
parent 9eabe316db
commit a53cf80d35
11 changed files with 40 additions and 36 deletions
--- a/scripts/bash/configure-server.sh
+++ b/scripts/bash/configure-server.sh
@@ -3,8 +3,9 @@

 set -euo pipefail

-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
+PROJECT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+APPLY_SCRIPT="$PROJECT_DIR/scripts/python/apply-config.py"

 # Colors for output
 GREEN='\033[0;32m'
@@ -70,7 +71,7 @@ EOF
    echo -e "\n${YELLOW}Would you like to apply these changes now? (y/N)${NC}"
    read -r response
    if [[ "$response" =~ ^[Yy]$ ]]; then
-        python3 "$SCRIPT_DIR/apply-config.py"
+        python3 "$APPLY_SCRIPT"
    else
        echo -e "${BLUE}ℹ️  Run '$(basename "$0") apply' when ready to apply changes${NC}"
    fi
@@ -114,7 +115,7 @@ show_status() {

    # Show available presets
    echo -e "\n${BLUE}📋 Available Presets:${NC}"
-    python3 "$SCRIPT_DIR/apply-config.py" --list-presets
+    python3 "$APPLY_SCRIPT" --list-presets
 }

 main() {
@@ -123,7 +124,7 @@ main() {
    case "${1:-}" in
        "apply")
            echo -e "${YELLOW}🔄 Applying configuration overrides...${NC}"
-            python3 "$SCRIPT_DIR/apply-config.py" "${@:2}"
+            python3 "$APPLY_SCRIPT" "${@:2}"
            echo -e "\n${GREEN}✅ Configuration applied!${NC}"
            echo -e "${YELLOW}ℹ️  Restart your server to apply changes:${NC} docker compose restart"
            ;;
@@ -131,16 +132,16 @@ main() {
            if [[ -z "${2:-}" ]]; then
                echo -e "${RED}❌ Please specify a preset name${NC}"
                echo -e "Available presets:"
-                python3 "$SCRIPT_DIR/apply-config.py" --list-presets
+                python3 "$APPLY_SCRIPT" --list-presets
                exit 1
            fi
            echo -e "${YELLOW}🎯 Applying preset: $2${NC}"
-            python3 "$SCRIPT_DIR/apply-config.py" --preset "$2" "${@:3}"
+            python3 "$APPLY_SCRIPT" --preset "$2" "${@:3}"
            echo -e "\n${GREEN}✅ Preset '$2' applied!${NC}"
            echo -e "${YELLOW}ℹ️  Restart your server to apply changes:${NC} docker compose restart"
            ;;
        "list")
-            python3 "$SCRIPT_DIR/apply-config.py" --list-presets
+            python3 "$APPLY_SCRIPT" --list-presets
            ;;
        "edit")
            edit_config
@@ -159,4 +160,4 @@ main() {
    esac
 }

-main "$@"
+main "$@"
--- a/scripts/bash/db-import-conditional.sh
+++ b/scripts/bash/db-import-conditional.sh
@@ -2,6 +2,9 @@
 # azerothcore-rm
 set -e

+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+
 print_help() {
  cat <<'EOF'
 Usage: db-import-conditional.sh [options]
@@ -91,9 +94,9 @@ echo "🔍 Checking for backups to restore..."
 BACKUP_SEARCH_PATHS=(
  "/backups"
  "/var/lib/mysql-persistent"
-  "$SCRIPT_DIR/../storage/backups"
-  "$SCRIPT_DIR/../manual-backups"
-  "$SCRIPT_DIR/../ImportBackup"
+  "$PROJECT_ROOT/storage/backups"
+  "$PROJECT_ROOT/manual-backups"
+  "$PROJECT_ROOT/storage/backups/ImportBackup"
 )

 backup_path=""
--- a/scripts/bash/deploy-tools.sh
+++ b/scripts/bash/deploy-tools.sh
@@ -4,7 +4,8 @@

 set -euo pipefail

-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
+ROOT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
 DEFAULT_COMPOSE_FILE="$ROOT_DIR/docker-compose.yml"
 ENV_FILE="$ROOT_DIR/.env"
 TEMPLATE_FILE="$ROOT_DIR/.env.template"
--- a/scripts/bash/manage-modules-sql.sh
+++ b/scripts/bash/manage-modules-sql.sh
@@ -5,7 +5,9 @@ trap 'echo "    ❌ SQL helper error (line ${LINENO}): ${BASH_COMMAND}" >&2' ERR

 CUSTOM_SQL_ROOT="/tmp/scripts/sql/custom"
 ALT_CUSTOM_SQL_ROOT="/scripts/sql/custom"
-HELPER_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+HELPER_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
+PROJECT_ROOT="$(cd "$HELPER_DIR/../.." && pwd)"
+MODULE_HELPER="${MODULE_HELPER:-$PROJECT_ROOT/scripts/python/modules.py}"

 SQL_SUCCESS_LOG=()
 SQL_FAILURE_LOG=()
@@ -116,7 +118,7 @@ ensure_module_metadata(){

  local -a module_py_candidates=(
    "${MODULE_HELPER:-}"
-    "${HELPER_DIR%/*}/modules.py"
+    "$PROJECT_ROOT/scripts/python/modules.py"
    "/tmp/scripts/python/modules.py"
    "/scripts/python/modules.py"
  )
--- a/scripts/bash/manage-modules.sh
+++ b/scripts/bash/manage-modules.sh
@@ -6,8 +6,8 @@
 set -euo pipefail

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
-MODULE_HELPER="$SCRIPT_DIR/modules.py"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+MODULE_HELPER="$PROJECT_ROOT/scripts/python/modules.py"
 DEFAULT_ENV_PATH="$PROJECT_ROOT/.env"
 ENV_PATH="${MODULES_ENV_PATH:-$DEFAULT_ENV_PATH}"
 TEMPLATE_FILE="$PROJECT_ROOT/.env.template"
@@ -65,11 +65,6 @@ resolve_manifest_path(){
    echo "$candidate"
    return
  fi
-  candidate="$SCRIPT_DIR/../config/module-manifest.json"
-  if [ -f "$candidate" ]; then
-    echo "$candidate"
-    return
-  fi
  candidate="/tmp/config/module-manifest.json"
  if [ -f "$candidate" ]; then
    echo "$candidate"
@@ -132,7 +127,7 @@ run_post_install_hooks(){

  IFS=',' read -r -a hooks <<< "$hooks_csv"
  local -a hook_search_paths=(
-    "$SCRIPT_DIR/hooks"
+    "$PROJECT_ROOT/scripts/hooks"
    "/tmp/scripts/hooks"
    "/scripts/hooks"
  )
@@ -466,7 +461,7 @@ load_sql_helper(){
  )

  if [ "${MODULES_LOCAL_RUN:-0}" = "1" ]; then
-    helper_paths+=("$SCRIPT_DIR/manage-modules-sql.sh")
+    helper_paths+=("$PROJECT_ROOT/scripts/bash/manage-modules-sql.sh")
  fi

  local helper_path=""
--- a/scripts/bash/migrate-stack.sh
+++ b/scripts/bash/migrate-stack.sh
@@ -6,7 +6,7 @@
 set -euo pipefail

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
 ENV_FILE="$PROJECT_ROOT/.env"
 TEMPLATE_FILE="$PROJECT_ROOT/.env.template"
 source "$PROJECT_ROOT/scripts/bash/project_name.sh"
--- a/scripts/bash/rebuild-with-modules.sh
+++ b/scripts/bash/rebuild-with-modules.sh
@@ -5,7 +5,7 @@
 set -e

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
+PROJECT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
 ENV_FILE="$PROJECT_DIR/.env"
 TEMPLATE_FILE="$PROJECT_DIR/.env.template"
 source "$PROJECT_DIR/scripts/bash/project_name.sh"
--- a/scripts/bash/stage-modules.sh
+++ b/scripts/bash/stage-modules.sh
@@ -61,8 +61,8 @@ sync_local_staging(){
  fi
 }

-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
+PROJECT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
 ENV_FILE="$PROJECT_DIR/.env"
 TEMPLATE_FILE="$PROJECT_DIR/.env.template"
 source "$PROJECT_DIR/scripts/bash/project_name.sh"
@@ -314,7 +314,7 @@ if [ "$TARGET_PROFILE" = "modules" ]; then
    show_staging_step "Source Rebuild" "Preparing custom build with modules"
    echo "🚀 Triggering source rebuild with modules..."
    if confirm "Proceed with source rebuild? (15-45 minutes)" n; then
-      "$SCRIPT_DIR/rebuild-with-modules.sh" ${ASSUME_YES:+--yes}
+      "$PROJECT_DIR/scripts/bash/rebuild-with-modules.sh" ${ASSUME_YES:+--yes}
    else
      echo "❌ Rebuild cancelled"
      exit 1
--- a/scripts/bash/start-containers.sh
+++ b/scripts/bash/start-containers.sh
@@ -6,14 +6,15 @@

 set -euo pipefail

-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"

-PROFILE="$(python3 - <<'PY' "$ROOT_DIR"
+PROFILE="$(python3 - <<'PY' "$PROJECT_ROOT"
 import json, subprocess, sys
 from pathlib import Path

 root = Path(sys.argv[1])
-modules_py = root / "scripts" / "modules.py"
+modules_py = root / "scripts" / "python" / "modules.py"
 env_path = root / ".env"
 manifest_path = root / "config" / "module-manifest.json"

@@ -36,4 +37,4 @@ print(profile)
 PY
 )"

-exec "${ROOT_DIR}/deploy.sh" --profile "$PROFILE" --yes --no-watch
+exec "${PROJECT_ROOT}/deploy.sh" --profile "$PROFILE" --yes --no-watch
--- a/scripts/bash/stop-containers.sh
+++ b/scripts/bash/stop-containers.sh
@@ -4,6 +4,7 @@

 set -euo pipefail

-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"

-exec "${SCRIPT_DIR}/cleanup.sh" --soft --force
+exec "${PROJECT_ROOT}/cleanup.sh" --soft --force