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

Fix browser cleanup exit issue in pipefail mode

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

View File

@@ -130,6 +130,14 @@ 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
# Build list of existing browser directories
local -a search_dirs=()
[[ -d "$HOME/Library/Application Support/Google/Chrome" ]] && search_dirs+=("$HOME/Library/Application Support/Google/Chrome")
[[ -d "$HOME/Library/Application Support/Microsoft Edge" ]] && search_dirs+=("$HOME/Library/Application Support/Microsoft Edge")
[[ -d "$HOME/Library/Application Support/BraveSoftware/Brave-Browser" ]] && search_dirs+=("$HOME/Library/Application Support/BraveSoftware/Brave-Browser")
[[ -d "$HOME/Library/Application Support/Arc/User Data" ]] && search_dirs+=("$HOME/Library/Application Support/Arc/User Data")
if [[ ${#search_dirs[@]} -gt 0 ]]; then
while IFS= read -r sw_path; do while IFS= read -r sw_path; do
((sw_count++)) ((sw_count++))
[[ -z "$sw_path" ]] && continue [[ -z "$sw_path" ]] && continue
@@ -140,11 +148,9 @@ clean_browsers() {
[[ "$sw_path" == *"Arc"* ]] && browser_name="Arc" [[ "$sw_path" == *"Arc"* ]] && browser_name="Arc"
[[ "$profile_name" != "Default" ]] && browser_name="$browser_name ($profile_name)" [[ "$profile_name" != "Default" ]] && browser_name="$browser_name ($profile_name)"
clean_service_worker_cache "$browser_name" "$sw_path" clean_service_worker_cache "$browser_name" "$sw_path"
done < <(find "$HOME/Library/Application Support/Google/Chrome" \ done < <(find "${search_dirs[@]}" \
"$HOME/Library/Application Support/Microsoft Edge" \
"$HOME/Library/Application Support/BraveSoftware/Brave-Browser" \
"$HOME/Library/Application Support/Arc/User Data" \
-maxdepth 6 -type d -name "CacheStorage" -path "*/Service Worker/*" 2> /dev/null || true) -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