From 8e9c460713a64cd52901806267f7f8aec7b78e62 Mon Sep 17 00:00:00 2001 From: The_miro Date: Fri, 26 Jun 2026 13:31:12 +0200 Subject: [PATCH] refactor(tools): move module generation tooling into setup/tools/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sync-modules.sh and generate-modules.sh are developer tooling, not part of the installer runtime — same rationale as freeipa-image.sh. Update SETUP_DIR paths in both scripts to resolve correctly from the new location. Co-Authored-By: Claude Sonnet 4.6 --- setup/{ => tools}/generate-modules.sh | 9 +++++---- setup/{ => tools}/sync-modules.sh | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) rename setup/{ => tools}/generate-modules.sh (97%) rename setup/{ => tools}/sync-modules.sh (88%) diff --git a/setup/generate-modules.sh b/setup/tools/generate-modules.sh similarity index 97% rename from setup/generate-modules.sh rename to setup/tools/generate-modules.sh index d39a648..7404a69 100755 --- a/setup/generate-modules.sh +++ b/setup/tools/generate-modules.sh @@ -11,10 +11,11 @@ set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CONF="$SCRIPT_DIR/modules.conf" -TUI="$SCRIPT_DIR/tui-install.sh" -AF="$SCRIPT_DIR/generate-answerfile.sh" -DOCS="$SCRIPT_DIR/../docs/md/modules.md" +SETUP_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" +CONF="$SETUP_DIR/modules.conf" +TUI="$SETUP_DIR/tui-install.sh" +AF="$SETUP_DIR/generate-answerfile.sh" +DOCS="$SETUP_DIR/../docs/md/modules.md" DRY_RUN=false [[ "${1:-}" == "--dry-run" ]] && DRY_RUN=true diff --git a/setup/sync-modules.sh b/setup/tools/sync-modules.sh similarity index 88% rename from setup/sync-modules.sh rename to setup/tools/sync-modules.sh index e2cabf1..8101a76 100755 --- a/setup/sync-modules.sh +++ b/setup/tools/sync-modules.sh @@ -4,8 +4,9 @@ set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CONF="$SCRIPT_DIR/modules.conf" -APPS="$SCRIPT_DIR/modules/optional-Modules/apps" +SETUP_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" +CONF="$SETUP_DIR/modules.conf" +APPS="$SETUP_DIR/modules/optional-Modules/apps" # Read all existing IDs from modules.conf into a set. declare -A known