mirrors/Mole
1
0
Fork 0
mirror of https://github.com/tw93/Mole.git synced 2026-02-06 16:02:58 +00:00
Code Activity

Fix the system update check problem

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/core/common.sh
View File

@@ -553,23 +553,23 @@ run_with_timeout() {
"$@" &
local cmd_pid=$!
# More efficient wait: use wait with timeout in subshell
(
sleep "$duration" &
local timer_pid=$!
wait "$cmd_pid" 2>/dev/null && kill "$timer_pid" 2>/dev/null && exit 0
kill -TERM "$cmd_pid" 2>/dev/null || true
wait "$cmd_pid" 2> /dev/null && kill "$timer_pid" 2> /dev/null && exit 0
kill -TERM "$cmd_pid" 2> /dev/null || true
sleep 0.5
kill -KILL "$cmd_pid" 2>/dev/null || true
kill -KILL "$cmd_pid" 2> /dev/null || true
exit 124
) &
local watcher_pid=$!
wait "$cmd_pid" 2>/dev/null
wait "$cmd_pid" 2> /dev/null
local exit_code=$?
kill "$watcher_pid" 2>/dev/null || true
wait "$watcher_pid" 2>/dev/null || true
kill "$watcher_pid" 2> /dev/null || true
wait "$watcher_pid" 2> /dev/null || true
return $exit_code
}

14
lib/manage/update.sh
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
}