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

Fix browser cleanup exit issue in pipefail mode

Browse Source
This commit is contained in:
Tw93
2025-12-05 19:51:40 +08:00
parent 0de481bf2d
commit f86fae9f30
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/clean/user.sh
View File

@@ -130,21 +130,27 @@ clean_browsers() {
# Scan for Service Worker caches # Scan for Service Worker caches
# Use process substitution to avoid subshell issues with set -e # Use process substitution to avoid subshell issues with set -e
local sw_count=0 local sw_count=0
while IFS= read -r sw_path; do # Build list of existing browser directories
((sw_count++)) local -a search_dirs=()
[[ -z "$sw_path" ]] && continue [[ -d "$HOME/Library/Application Support/Google/Chrome" ]] && search_dirs+=("$HOME/Library/Application Support/Google/Chrome")
local profile_name=$(basename "$(dirname "$(dirname "$sw_path")")") [[ -d "$HOME/Library/Application Support/Microsoft Edge" ]] && search_dirs+=("$HOME/Library/Application Support/Microsoft Edge")
local browser_name="Chrome" [[ -d "$HOME/Library/Application Support/BraveSoftware/Brave-Browser" ]] && search_dirs+=("$HOME/Library/Application Support/BraveSoftware/Brave-Browser")
[[ "$sw_path" == *"Microsoft Edge"* ]] && browser_name="Edge" [[ -d "$HOME/Library/Application Support/Arc/User Data" ]] && search_dirs+=("$HOME/Library/Application Support/Arc/User Data")
[[ "$sw_path" == *"Brave"* ]] && browser_name="Brave"
[[ "$sw_path" == *"Arc"* ]] && browser_name="Arc" if [[ ${#search_dirs[@]} -gt 0 ]]; then
[[ "$profile_name" != "Default" ]] && browser_name="$browser_name ($profile_name)" while IFS= read -r sw_path; do
clean_service_worker_cache "$browser_name" "$sw_path" ((sw_count++))
done < <(find "$HOME/Library/Application Support/Google/Chrome" \ [[ -z "$sw_path" ]] && continue
"$HOME/Library/Application Support/Microsoft Edge" \ local profile_name=$(basename "$(dirname "$(dirname "$sw_path")")")
"$HOME/Library/Application Support/BraveSoftware/Brave-Browser" \ local browser_name="Chrome"
"$HOME/Library/Application Support/Arc/User Data" \ [[ "$sw_path" == *"Microsoft Edge"* ]] && browser_name="Edge"
-maxdepth 6 -type d -name "CacheStorage" -path "*/Service Worker/*" 2> /dev/null || true) [[ "$sw_path" == *"Brave"* ]] && browser_name="Brave"
[[ "$sw_path" == *"Arc"* ]] && browser_name="Arc"
[[ "$profile_name" != "Default" ]] && browser_name="$browser_name ($profile_name)"
clean_service_worker_cache "$browser_name" "$sw_path"
done < <(find "${search_dirs[@]}" \
-maxdepth 6 -type d -name "CacheStorage" -path "*/Service Worker/*" 2> /dev/null || true)
fi
# Stop spinner after scan completes # Stop spinner after scan completes
if [[ -t 1 ]]; then if [[ -t 1 ]]; then

2
mole
View File

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