diff --git a/lib/clean/dev.sh b/lib/clean/dev.sh index 1557900..ffd6fa1 100644 --- a/lib/clean/dev.sh +++ b/lib/clean/dev.sh @@ -153,7 +153,7 @@ clean_dev_mobile() { debug_log "Checking for unavailable Xcode simulators" if [[ "$DRY_RUN" == "true" ]]; then - clean_tool_cache "Xcode unavailable simulators" xcrun simctl delete unavailable + clean_tool_cache "Xcode unavailable simulators" xcrun simctl delete unavailable else if [[ -t 1 ]]; then MOLE_SPINNER_PREFIX=" " start_inline_spinner "Checking unavailable simulators..." @@ -315,10 +315,10 @@ clean_developer_tools() { safe_clean "$lock_dir"/* "Homebrew lock files" elif [[ -d "$lock_dir" ]]; then # Directory exists but not writable. Check if empty to avoid noise. - if [[ -n "$(ls -A "$lock_dir" 2>/dev/null)" ]]; then - # Only try sudo ONCE if we really need to, or just skip to avoid spam - # Decision: Skip strict system/root owned locks to avoid nag. - debug_log "Skipping read-only Homebrew locks in $lock_dir" + if [[ -n "$(ls -A "$lock_dir" 2> /dev/null)" ]]; then + # Only try sudo ONCE if we really need to, or just skip to avoid spam + # Decision: Skip strict system/root owned locks to avoid nag. + debug_log "Skipping read-only Homebrew locks in $lock_dir" fi fi done diff --git a/lib/clean/system.sh b/lib/clean/system.sh index 132b703..3850a5f 100644 --- a/lib/clean/system.sh +++ b/lib/clean/system.sh @@ -133,7 +133,7 @@ clean_time_machine_failed_backups() { [[ "$volume" == "/Volumes/MacintoshHD" || "$volume" == "/" ]] && continue if [[ -t 1 ]]; then - MOLE_SPINNER_PREFIX=" " start_inline_spinner "Scanning backup volumes..." + MOLE_SPINNER_PREFIX=" " start_inline_spinner "Scanning backup volumes..." fi # Skip if volume is a symlink (security check) @@ -290,7 +290,7 @@ clean_local_snapshots() { # Format: com.apple.TimeMachine.2023-10-25-120000 if [[ "$line" =~ com\.apple\.TimeMachine\.([0-9]{4})-([0-9]{2})-([0-9]{2})-([0-9]{6}) ]]; then local date_str="${BASH_REMATCH[1]}-${BASH_REMATCH[2]}-${BASH_REMATCH[3]} ${BASH_REMATCH[4]:0:2}:${BASH_REMATCH[4]:2:2}:${BASH_REMATCH[4]:4:2}" - local snap_ts=$(date -j -f "%Y-%m-%d %H:%M:%S" "$date_str" "+%s" 2>/dev/null || echo "0") + local snap_ts=$(date -j -f "%Y-%m-%d %H:%M:%S" "$date_str" "+%s" 2> /dev/null || echo "0") # Skip if parsing failed [[ "$snap_ts" == "0" ]] && continue @@ -306,11 +306,11 @@ clean_local_snapshots() { else # Secure removal if safe_sudo tmutil deletelocalsnapshots "${BASH_REMATCH[1]}-${BASH_REMATCH[2]}-${BASH_REMATCH[3]}-${BASH_REMATCH[4]}" > /dev/null 2>&1; then - echo -e " ${GREEN}${ICON_SUCCESS}${NC} Removed snapshot: $snap_name" - ((cleaned_count++)) - note_activity + echo -e " ${GREEN}${ICON_SUCCESS}${NC} Removed snapshot: $snap_name" + ((cleaned_count++)) + note_activity else - echo -e " ${YELLOW}!${NC} Failed to remove: $snap_name" + echo -e " ${YELLOW}!${NC} Failed to remove: $snap_name" fi fi fi diff --git a/lib/clean/user.sh b/lib/clean/user.sh index 1042183..b60c526 100644 --- a/lib/clean/user.sh +++ b/lib/clean/user.sh @@ -126,7 +126,7 @@ clean_sandboxed_app_caches() { # Check if dir exists and has content if [[ -d "$cache_dir" ]]; then # Fast check if empty (avoid expensive size calc on empty dirs) - if [[ -n "$(ls -A "$cache_dir" 2>/dev/null)" ]]; then + if [[ -n "$(ls -A "$cache_dir" 2> /dev/null)" ]]; then # Get size local size=$(get_path_size_kb "$cache_dir") ((total_size += size)) @@ -137,7 +137,7 @@ clean_sandboxed_app_caches() { # Clean contents safely # We know this is a user cache path, so rm -rf is acceptable here # provided we keep the Cache directory itself - rm -rf "$cache_dir"/* 2>/dev/null || true + rm -rf "$cache_dir"/* 2> /dev/null || true fi fi fi @@ -256,18 +256,18 @@ clean_application_support_logs() { local -a start_candidates=("$app_dir/log" "$app_dir/logs" "$app_dir/activitylog" "$app_dir/Cache/Cache_Data" "$app_dir/Crashpad/completed") for candidate in "${start_candidates[@]}"; do - if [[ -d "$candidate" ]]; then - if [[ -n "$(ls -A "$candidate" 2>/dev/null)" ]]; then + if [[ -d "$candidate" ]]; then + if [[ -n "$(ls -A "$candidate" 2> /dev/null)" ]]; then local size=$(get_path_size_kb "$candidate") ((total_size += size)) ((cleaned_count++)) found_any=true if [[ "$DRY_RUN" != "true" ]]; then - safe_remove "$candidate"/* true >/dev/null 2>&1 || true + safe_remove "$candidate"/* true > /dev/null 2>&1 || true fi fi - fi + fi done done @@ -281,18 +281,18 @@ clean_application_support_logs() { local -a gc_candidates=("$container_path/Logs" "$container_path/Library/Logs") for candidate in "${gc_candidates[@]}"; do - if [[ -d "$candidate" ]]; then - if [[ -n "$(ls -A "$candidate" 2>/dev/null)" ]]; then + if [[ -d "$candidate" ]]; then + if [[ -n "$(ls -A "$candidate" 2> /dev/null)" ]]; then local size=$(get_path_size_kb "$candidate") ((total_size += size)) ((cleaned_count++)) found_any=true if [[ "$DRY_RUN" != "true" ]]; then - safe_remove "$candidate"/* true >/dev/null 2>&1 || true + safe_remove "$candidate"/* true > /dev/null 2>&1 || true fi fi - fi + fi done done @@ -301,9 +301,9 @@ clean_application_support_logs() { if [[ "$found_any" == "true" ]]; then local size_human=$(bytes_to_human "$((total_size * 1024))") if [[ "$DRY_RUN" == "true" ]]; then - echo -e " ${YELLOW}→${NC} Application Support logs/caches ${YELLOW}($size_human dry)${NC}" + echo -e " ${YELLOW}→${NC} Application Support logs/caches ${YELLOW}($size_human dry)${NC}" else - echo -e " ${GREEN}${ICON_SUCCESS}${NC} Application Support logs/caches ${GREEN}($size_human)${NC}" + echo -e " ${GREEN}${ICON_SUCCESS}${NC} Application Support logs/caches ${GREEN}($size_human)${NC}" fi # Update global counters ((files_cleaned += cleaned_count))