mirror of
https://github.com/tw93/Mole.git
synced 2026-02-07 01:55:36 +00:00
Reconstruct clean lib code
This commit is contained in:
13
bin/check.sh
13
bin/check.sh
@@ -4,15 +4,12 @@ set -euo pipefail
|
||||
|
||||
# Load common functions
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
source "$SCRIPT_DIR/lib/common.sh"
|
||||
source "$SCRIPT_DIR/lib/sudo_manager.sh"
|
||||
source "$SCRIPT_DIR/lib/update_manager.sh"
|
||||
source "$SCRIPT_DIR/lib/autofix_manager.sh"
|
||||
source "$SCRIPT_DIR/lib/core/common.sh"
|
||||
source "$SCRIPT_DIR/lib/core/sudo.sh"
|
||||
source "$SCRIPT_DIR/lib/manage/update.sh"
|
||||
source "$SCRIPT_DIR/lib/manage/autofix.sh"
|
||||
|
||||
source "$SCRIPT_DIR/lib/check_updates.sh"
|
||||
source "$SCRIPT_DIR/lib/check_health.sh"
|
||||
source "$SCRIPT_DIR/lib/check_security.sh"
|
||||
source "$SCRIPT_DIR/lib/check_config.sh"
|
||||
source "$SCRIPT_DIR/lib/check/all.sh"
|
||||
|
||||
cleanup_all() {
|
||||
stop_sudo_session
|
||||
|
||||
24
bin/clean.sh
24
bin/clean.sh
@@ -10,16 +10,16 @@ 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/sudo_manager.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean_brew.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean_caches.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean_apps.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean_dev.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean_user_apps.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean_system.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean_user_data.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean_maintenance.sh"
|
||||
source "$SCRIPT_DIR/../lib/core/common.sh"
|
||||
source "$SCRIPT_DIR/../lib/core/sudo.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean/brew.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean/caches.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean/apps.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean/dev.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean/app_caches.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean/system.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean/user.sh"
|
||||
source "$SCRIPT_DIR/../lib/clean/maintenance.sh"
|
||||
|
||||
# Configuration
|
||||
SYSTEM_CLEAN=false
|
||||
@@ -35,7 +35,7 @@ readonly PROTECTED_SW_DOMAINS=(
|
||||
)
|
||||
|
||||
# Whitelist patterns (loaded from common.sh)
|
||||
# FINDER_METADATA_SENTINEL and DEFAULT_WHITELIST_PATTERNS defined in lib/common.sh
|
||||
# FINDER_METADATA_SENTINEL and DEFAULT_WHITELIST_PATTERNS defined in lib/core/common.sh
|
||||
declare -a WHITELIST_PATTERNS=()
|
||||
WHITELIST_WARNINGS=()
|
||||
|
||||
@@ -846,7 +846,7 @@ main() {
|
||||
DRY_RUN=true
|
||||
;;
|
||||
"--whitelist")
|
||||
source "$SCRIPT_DIR/../lib/whitelist_manager.sh"
|
||||
source "$SCRIPT_DIR/../lib/manage/whitelist.sh"
|
||||
manage_whitelist
|
||||
exit 0
|
||||
;;
|
||||
|
||||
@@ -4,18 +4,14 @@ set -euo pipefail
|
||||
|
||||
# Load common functions
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
source "$SCRIPT_DIR/lib/common.sh"
|
||||
source "$SCRIPT_DIR/lib/optimize_health.sh"
|
||||
source "$SCRIPT_DIR/lib/sudo_manager.sh"
|
||||
source "$SCRIPT_DIR/lib/update_manager.sh"
|
||||
source "$SCRIPT_DIR/lib/autofix_manager.sh"
|
||||
source "$SCRIPT_DIR/lib/optimization_tasks.sh"
|
||||
source "$SCRIPT_DIR/lib/core/common.sh"
|
||||
source "$SCRIPT_DIR/lib/core/sudo.sh"
|
||||
source "$SCRIPT_DIR/lib/manage/update.sh"
|
||||
source "$SCRIPT_DIR/lib/manage/autofix.sh"
|
||||
source "$SCRIPT_DIR/lib/optimize/tasks.sh"
|
||||
|
||||
# Load check modules
|
||||
source "$SCRIPT_DIR/lib/check_updates.sh"
|
||||
source "$SCRIPT_DIR/lib/check_health.sh"
|
||||
source "$SCRIPT_DIR/lib/check_security.sh"
|
||||
source "$SCRIPT_DIR/lib/check_config.sh"
|
||||
source "$SCRIPT_DIR/lib/check/all.sh"
|
||||
|
||||
# Colors and icons from common.sh
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
LIB_DIR="$(cd "$SCRIPT_DIR/../lib" && pwd)"
|
||||
|
||||
# Source common functions
|
||||
# shellcheck source=../lib/common.sh
|
||||
source "$LIB_DIR/common.sh"
|
||||
# shellcheck source=../lib/core/common.sh
|
||||
source "$LIB_DIR/core/common.sh"
|
||||
|
||||
readonly PAM_SUDO_FILE="/etc/pam.d/sudo"
|
||||
readonly PAM_TID_LINE="auth sufficient pam_tid.so"
|
||||
|
||||
@@ -14,12 +14,12 @@ 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/menu_paginated.sh"
|
||||
source "$SCRIPT_DIR/../lib/ui_app_selector.sh"
|
||||
source "$SCRIPT_DIR/../lib/uninstall_batch.sh"
|
||||
source "$SCRIPT_DIR/../lib/core/common.sh"
|
||||
source "$SCRIPT_DIR/../lib/ui/menu_paginated.sh"
|
||||
source "$SCRIPT_DIR/../lib/ui/app_selector.sh"
|
||||
source "$SCRIPT_DIR/../lib/uninstall.sh"
|
||||
|
||||
# Note: Bundle preservation logic is now in lib/common.sh
|
||||
# Note: Bundle preservation logic is now in lib/core/common.sh
|
||||
|
||||
# Initialize global variables
|
||||
selected_apps=() # Global array for app selection
|
||||
@@ -404,7 +404,7 @@ load_applications() {
|
||||
# Read a single key with proper escape sequence handling
|
||||
# This function has been replaced by the menu.sh library
|
||||
|
||||
# Note: App file discovery and size calculation functions moved to lib/common.sh
|
||||
# Note: App file discovery and size calculation functions moved to lib/core/common.sh
|
||||
# Use find_app_files() and calculate_total_size() from common.sh
|
||||
|
||||
# Uninstall selected applications
|
||||
|
||||
Reference in New Issue
Block a user