From 2f0c74c62180e802e0e7334ca057083774696c55 Mon Sep 17 00:00:00 2001 From: Tw93 Date: Thu, 16 Oct 2025 10:53:00 +0800 Subject: [PATCH] Adjustment of file structure --- bin/uninstall.sh | 6 +++--- lib/{paginated_menu.sh => menu_paginated.sh} | 0 lib/{simple_menu.sh => menu_simple.sh} | 0 lib/{app_selector.sh => ui_app_selector.sh} | 0 lib/{batch_uninstall.sh => uninstall_batch.sh} | 0 lib/whitelist_manager.sh | 2 +- tests/uninstall.bats | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename lib/{paginated_menu.sh => menu_paginated.sh} (100%) rename lib/{simple_menu.sh => menu_simple.sh} (100%) rename lib/{app_selector.sh => ui_app_selector.sh} (100%) rename lib/{batch_uninstall.sh => uninstall_batch.sh} (100%) diff --git a/bin/uninstall.sh b/bin/uninstall.sh index 829af84..c28ec45 100755 --- a/bin/uninstall.sh +++ b/bin/uninstall.sh @@ -15,9 +15,9 @@ export LANG=C # Get script directory and source common functions SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "$SCRIPT_DIR/../lib/common.sh" -source "$SCRIPT_DIR/../lib/paginated_menu.sh" -source "$SCRIPT_DIR/../lib/app_selector.sh" -source "$SCRIPT_DIR/../lib/batch_uninstall.sh" +source "$SCRIPT_DIR/../lib/menu_paginated.sh" +source "$SCRIPT_DIR/../lib/ui_app_selector.sh" +source "$SCRIPT_DIR/../lib/uninstall_batch.sh" # Note: Bundle preservation logic is now in lib/common.sh diff --git a/lib/paginated_menu.sh b/lib/menu_paginated.sh similarity index 100% rename from lib/paginated_menu.sh rename to lib/menu_paginated.sh diff --git a/lib/simple_menu.sh b/lib/menu_simple.sh similarity index 100% rename from lib/simple_menu.sh rename to lib/menu_simple.sh diff --git a/lib/app_selector.sh b/lib/ui_app_selector.sh similarity index 100% rename from lib/app_selector.sh rename to lib/ui_app_selector.sh diff --git a/lib/batch_uninstall.sh b/lib/uninstall_batch.sh similarity index 100% rename from lib/batch_uninstall.sh rename to lib/uninstall_batch.sh diff --git a/lib/whitelist_manager.sh b/lib/whitelist_manager.sh index 827bef7..ceb167f 100755 --- a/lib/whitelist_manager.sh +++ b/lib/whitelist_manager.sh @@ -7,7 +7,7 @@ set -euo pipefail # Get script directory and source dependencies SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "$SCRIPT_DIR/common.sh" -source "$SCRIPT_DIR/simple_menu.sh" +source "$SCRIPT_DIR/menu_simple.sh" # Config file path WHITELIST_CONFIG="$HOME/.config/mole/whitelist" diff --git a/tests/uninstall.bats b/tests/uninstall.bats index b7f66f7..ca12b30 100644 --- a/tests/uninstall.bats +++ b/tests/uninstall.bats @@ -78,7 +78,7 @@ EOF run env HOME="$HOME" PROJECT_ROOT="$PROJECT_ROOT" bash --noprofile --norc << 'EOF' set -euo pipefail source "$PROJECT_ROOT/lib/common.sh" -source "$PROJECT_ROOT/lib/batch_uninstall.sh" +source "$PROJECT_ROOT/lib/uninstall_batch.sh" # Test stubs request_sudo_access() { return 0; }