1
0
mirror of https://github.com/tw93/Mole.git synced 2026-02-16 07:11:11 +00:00

Fix the system update check problem

This commit is contained in:
Tw93
2025-12-04 17:52:19 +08:00
parent 44825732a9
commit 36c993ec1c
4 changed files with 31 additions and 24 deletions

View File

@@ -398,7 +398,10 @@ safe_clean() {
size=$(get_path_size_kb "$path" 2> /dev/null || echo "0")
fi
[[ "$size" == "0" || -z "$size" ]] && { ((idx++)); continue; }
[[ "$size" == "0" || -z "$size" ]] && {
((idx++))
continue
}
# Write parent|size|path to temp file
echo "$(dirname "$path")|$size|$path" >> "$paths_temp"
@@ -687,17 +690,17 @@ perform_cleanup() {
# Scan for .app bundles - optimized with PlistBuddy and xargs
for search_path in "${search_paths[@]}"; do
[[ -d "$search_path" ]] || continue
find "$search_path" -maxdepth 3 -name "Info.plist" -path "*/Contents/Info.plist" 2>/dev/null | \
xargs -I {} /usr/libexec/PlistBuddy -c "Print :CFBundleIdentifier" {} 2>/dev/null | \
find "$search_path" -maxdepth 3 -name "Info.plist" -path "*/Contents/Info.plist" 2> /dev/null |
xargs -I {} /usr/libexec/PlistBuddy -c "Print :CFBundleIdentifier" {} 2> /dev/null |
grep -v "^$" >> "$installed_bundles" || true
done
# Get running applications - no timeout needed for fast osascript
osascript -e 'tell application "System Events" to get bundle identifier of every application process' 2>/dev/null | \
osascript -e 'tell application "System Events" to get bundle identifier of every application process' 2> /dev/null |
tr ',' '\n' | sed -e 's/^ *//;s/ *$//' -e '/^$/d' >> "$installed_bundles" || true
# Get LaunchAgents - fast operation, no timeout needed
find ~/Library/LaunchAgents /Library/LaunchAgents -name "*.plist" -type f 2>/dev/null | \
find ~/Library/LaunchAgents /Library/LaunchAgents -name "*.plist" -type f 2> /dev/null |
xargs -I {} basename {} .plist >> "$installed_bundles" 2> /dev/null || true
# Deduplicate

View File

@@ -220,7 +220,7 @@ perform_updates() {
# Check sudo access
if ! has_sudo_session; then
if ! ensure_sudo_session "Software updates require admin access"; then
echo -e "${YELLOW}${ICON_WARNING}${NC} Skipping App Store updates (admin authentication required)"
echo -e "${YELLOW}${NC} App Store updates available — update via System Settings"
echo ""
((total_count--))
if [[ -n "${MACOS_UPDATE_AVAILABLE:-}" && "${MACOS_UPDATE_AVAILABLE}" == "true" ]]; then
@@ -237,8 +237,9 @@ perform_updates() {
# Update macOS
if [[ -n "${MACOS_UPDATE_AVAILABLE:-}" && "${MACOS_UPDATE_AVAILABLE}" == "true" && "$macos_handled_via_appstore" != "true" ]]; then
if ! has_sudo_session; then
echo -e "${YELLOW}${ICON_WARNING}${NC} Skipping macOS updates (admin authentication required)"
echo -e "${YELLOW}${NC} macOS updates available — update via System Settings"
echo ""
((total_count--))
else
_perform_macos_update
fi
@@ -258,15 +259,18 @@ perform_updates() {
fi
# Summary
if [[ $updated_count -eq $total_count && $total_count -gt 0 ]]; then
if [[ $total_count -eq 0 ]]; then
echo -e "${GRAY}No updates to perform${NC}"
return 0
elif [[ $updated_count -eq $total_count ]]; then
echo -e "${GREEN}All updates completed (${updated_count}/${total_count})${NC}"
return 0
elif [[ $updated_count -gt 0 ]]; then
echo -e "${YELLOW}Partial updates completed (${updated_count}/${total_count})${NC}"
return 1
return 0
else
echo -e "${RED}No updates were completed${NC}"
return 1
return 0
fi
}

2
mole
View File

@@ -22,7 +22,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "$SCRIPT_DIR/lib/core/common.sh"
# Version info
VERSION="1.11.22"
VERSION="1.11.23"
MOLE_TAGLINE="can dig deep to clean your Mac."
# Check if Touch ID is already configured