mirror of
https://github.com/tw93/Mole.git
synced 2026-02-10 02:04:17 +00:00
✨ Support for hard-to-uninstall apps
This commit is contained in:
@@ -15,6 +15,7 @@ batch_uninstall_applications() {
|
|||||||
|
|
||||||
# Pre-process: Check for running apps and calculate total impact
|
# Pre-process: Check for running apps and calculate total impact
|
||||||
local -a running_apps=()
|
local -a running_apps=()
|
||||||
|
local -a sudo_apps=()
|
||||||
local total_estimated_size=0
|
local total_estimated_size=0
|
||||||
local -a app_details=()
|
local -a app_details=()
|
||||||
|
|
||||||
@@ -28,6 +29,11 @@ batch_uninstall_applications() {
|
|||||||
running_apps+=("$app_name")
|
running_apps+=("$app_name")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Check if app requires sudo to delete
|
||||||
|
if [[ ! -w "$(dirname "$app_path")" ]] || [[ "$(stat -f%Su "$app_path" 2>/dev/null)" == "root" ]]; then
|
||||||
|
sudo_apps+=("$app_name")
|
||||||
|
fi
|
||||||
|
|
||||||
# Calculate size for summary
|
# Calculate size for summary
|
||||||
local app_size_kb=$(du -sk "$app_path" 2>/dev/null | awk '{print $1}' || echo "0")
|
local app_size_kb=$(du -sk "$app_path" 2>/dev/null | awk '{print $1}' || echo "0")
|
||||||
local related_files=$(find_app_files "$bundle_id" "$app_name")
|
local related_files=$(find_app_files "$bundle_id" "$app_name")
|
||||||
@@ -50,6 +56,23 @@ batch_uninstall_applications() {
|
|||||||
local size_display="${total_estimated_size}KB"
|
local size_display="${total_estimated_size}KB"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Request sudo access if needed (do this before confirmation)
|
||||||
|
if [[ ${#sudo_apps[@]} -gt 0 ]]; then
|
||||||
|
echo ""
|
||||||
|
echo -e "${YELLOW}🔐 Admin privileges required for: ${BLUE}${sudo_apps[*]}${NC}"
|
||||||
|
echo -e "${BLUE}You will be prompted for your password before proceeding...${NC}"
|
||||||
|
if ! sudo -v; then
|
||||||
|
log_error "Administrator privileges required but not granted"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
# Keep sudo alive during the process
|
||||||
|
(while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null) &
|
||||||
|
local sudo_keepalive_pid=$!
|
||||||
|
|
||||||
|
# Set up cleanup trap for sudo keepalive
|
||||||
|
trap "kill $sudo_keepalive_pid 2>/dev/null || true; wait $sudo_keepalive_pid 2>/dev/null || true" EXIT INT TERM
|
||||||
|
fi
|
||||||
|
|
||||||
# Show summary and get batch confirmation
|
# Show summary and get batch confirmation
|
||||||
echo ""
|
echo ""
|
||||||
echo -e "${YELLOW}📦 Will remove ${BLUE}${#selected_apps[@]}${YELLOW} applications, free ${GREEN}$size_display${NC}"
|
echo -e "${YELLOW}📦 Will remove ${BLUE}${#selected_apps[@]}${YELLOW} applications, free ${GREEN}$size_display${NC}"
|
||||||
@@ -62,6 +85,10 @@ batch_uninstall_applications() {
|
|||||||
|
|
||||||
if [[ -n "$REPLY" ]]; then
|
if [[ -n "$REPLY" ]]; then
|
||||||
log_info "Uninstallation cancelled by user"
|
log_info "Uninstallation cancelled by user"
|
||||||
|
# Clean up sudo keepalive if it was started
|
||||||
|
if [[ -n "${sudo_keepalive_pid:-}" ]]; then
|
||||||
|
kill "$sudo_keepalive_pid" 2>/dev/null || true
|
||||||
|
fi
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -97,9 +124,45 @@ batch_uninstall_applications() {
|
|||||||
|
|
||||||
echo -e "${YELLOW}🗑️ Uninstalling: ${BLUE}$app_name${NC}"
|
echo -e "${YELLOW}🗑️ Uninstalling: ${BLUE}$app_name${NC}"
|
||||||
|
|
||||||
# Remove the application
|
# Check if app is still running (even after force quit)
|
||||||
if rm -rf "$app_path" 2>/dev/null; then
|
if pgrep -f "$app_name" >/dev/null 2>&1; then
|
||||||
echo -e " ${GREEN}✓${NC} Removed application"
|
echo -e " ${YELLOW}⚠️${NC} App is still running, attempting force kill..."
|
||||||
|
pkill -9 -f "$app_name" 2>/dev/null || true
|
||||||
|
sleep 2
|
||||||
|
if pgrep -f "$app_name" >/dev/null 2>&1; then
|
||||||
|
echo -e " ${RED}✗${NC} Failed to remove $app_name"
|
||||||
|
echo -e " ${YELLOW}Reason: Application is still running and cannot be terminated${NC}"
|
||||||
|
((failed_count++))
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if app requires admin privileges to delete
|
||||||
|
local needs_sudo=false
|
||||||
|
if [[ ! -w "$(dirname "$app_path")" ]] || [[ "$(stat -f%Su "$app_path" 2>/dev/null)" == "root" ]]; then
|
||||||
|
needs_sudo=true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Remove the application with appropriate permissions
|
||||||
|
local removal_success=false
|
||||||
|
local error_msg=""
|
||||||
|
if [[ "$needs_sudo" == "true" ]]; then
|
||||||
|
if sudo rm -rf "$app_path" 2>/dev/null; then
|
||||||
|
removal_success=true
|
||||||
|
echo -e " ${GREEN}✓${NC} Removed application"
|
||||||
|
else
|
||||||
|
error_msg="Failed to remove with sudo (check permissions or SIP protection)"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
if rm -rf "$app_path" 2>/dev/null; then
|
||||||
|
removal_success=true
|
||||||
|
echo -e " ${GREEN}✓${NC} Removed application"
|
||||||
|
else
|
||||||
|
error_msg="Failed to remove (check if app is running or protected)"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$removal_success" == "true" ]]; then
|
||||||
|
|
||||||
# Remove related files
|
# Remove related files
|
||||||
local files_removed=0
|
local files_removed=0
|
||||||
@@ -122,6 +185,9 @@ batch_uninstall_applications() {
|
|||||||
|
|
||||||
else
|
else
|
||||||
echo -e " ${RED}✗${NC} Failed to remove $app_name"
|
echo -e " ${RED}✗${NC} Failed to remove $app_name"
|
||||||
|
if [[ -n "$error_msg" ]]; then
|
||||||
|
echo -e " ${YELLOW}Reason: $error_msg${NC}"
|
||||||
|
fi
|
||||||
((failed_count++))
|
((failed_count++))
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -153,5 +219,11 @@ batch_uninstall_applications() {
|
|||||||
log_warning "$failed_count applications failed to uninstall"
|
log_warning "$failed_count applications failed to uninstall"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Clean up sudo keepalive if it was started
|
||||||
|
if [[ -n "${sudo_keepalive_pid:-}" ]]; then
|
||||||
|
kill "$sudo_keepalive_pid" 2>/dev/null || true
|
||||||
|
wait "$sudo_keepalive_pid" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
((total_size_cleaned += total_size_freed))
|
((total_size_cleaned += total_size_freed))
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user