diff --git a/bin/clean.sh b/bin/clean.sh index e4b6521..74caadc 100755 --- a/bin/clean.sh +++ b/bin/clean.sh @@ -864,7 +864,7 @@ perform_cleanup() { fda_status=$? if [[ $fda_status -eq 1 ]]; then echo "" - echo -e "${YELLOW}${ICON_WARNING}${NC} ${GRAY}Tip: Grant Full Disk Access to your terminal in System Settings for best results${NC}" + echo -e "${GRAY}${ICON_WARNING}${NC} ${GRAY}Tip: Grant Full Disk Access to your terminal in System Settings for best results${NC}" fi fi @@ -889,7 +889,7 @@ perform_cleanup() { if [[ ${#WHITELIST_WARNINGS[@]} -gt 0 ]]; then echo "" for warning in "${WHITELIST_WARNINGS[@]}"; do - echo -e " ${YELLOW}${ICON_WARNING}${NC} Whitelist: $warning" + echo -e " ${GRAY}${ICON_WARNING}${NC} Whitelist: $warning" done fi diff --git a/bin/optimize.sh b/bin/optimize.sh index 07e7d81..0413b5a 100755 --- a/bin/optimize.sh +++ b/bin/optimize.sh @@ -204,7 +204,7 @@ cleanup_path() { return fi if should_protect_path "$expanded_path"; then - echo -e "${YELLOW}${ICON_WARNING}${NC} Protected $label" + echo -e "${GRAY}${ICON_WARNING}${NC} Protected $label" return fi @@ -231,7 +231,7 @@ cleanup_path() { echo -e "${GREEN}${ICON_SUCCESS}${NC} $label" fi else - echo -e "${YELLOW}${ICON_WARNING}${NC} Skipped $label ${GRAY}(grant Full Disk Access to your terminal and retry)${NC}" + echo -e "${GRAY}${ICON_WARNING}${NC} Skipped $label ${GRAY}(grant Full Disk Access to your terminal and retry)${NC}" fi } @@ -304,7 +304,7 @@ apply_firewall_fix() { FIREWALL_DISABLED=false return 0 fi - echo -e " ${YELLOW}${ICON_WARNING}${NC} Failed to enable firewall (check permissions)" + echo -e " ${GRAY}${ICON_WARNING}${NC} Failed to enable firewall (check permissions)" return 1 } @@ -314,7 +314,7 @@ apply_gatekeeper_fix() { GATEKEEPER_DISABLED=false return 0 fi - echo -e " ${YELLOW}${ICON_WARNING}${NC} Failed to enable Gatekeeper" + echo -e " ${GRAY}${ICON_WARNING}${NC} Failed to enable Gatekeeper" return 1 } @@ -327,7 +327,7 @@ apply_touchid_fix() { perform_security_fixes() { if ! ensure_sudo_session "Security changes require admin access"; then - echo -e "${YELLOW}${ICON_WARNING}${NC} Skipped security fixes (sudo denied)" + echo -e "${GRAY}${ICON_WARNING}${NC} Skipped security fixes (sudo denied)" return 1 fi diff --git a/lib/check/all.sh b/lib/check/all.sh index c00c5f5..f23dd70 100644 --- a/lib/check/all.sh +++ b/lib/check/all.sh @@ -48,7 +48,7 @@ check_touchid_sudo() { fi if [[ "$is_supported" == "true" ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Touch ID ${YELLOW}Not configured for sudo${NC}" + echo -e " ${GRAY}${ICON_WARNING}${NC} Touch ID ${YELLOW}Not configured for sudo${NC}" export TOUCHID_NOT_CONFIGURED=true fi fi @@ -62,7 +62,7 @@ check_rosetta() { if [[ -f "/Library/Apple/usr/share/rosetta/rosetta" ]]; then echo -e " ${GREEN}✓${NC} Rosetta 2 Intel app translation ready" else - echo -e " ${YELLOW}${ICON_WARNING}${NC} Rosetta 2 ${YELLOW}Intel app support missing${NC}" + echo -e " ${GRAY}${ICON_WARNING}${NC} Rosetta 2 ${YELLOW}Intel app support missing${NC}" export ROSETTA_NOT_INSTALLED=true fi fi @@ -79,7 +79,7 @@ check_git_config() { if [[ -n "$git_name" && -n "$git_email" ]]; then echo -e " ${GREEN}✓${NC} Git Global identity configured" else - echo -e " ${YELLOW}${ICON_WARNING}${NC} Git ${YELLOW}User identity not set${NC}" + echo -e " ${GRAY}${ICON_WARNING}${NC} Git ${YELLOW}User identity not set${NC}" fi fi } @@ -119,7 +119,7 @@ check_firewall() { if [[ "$firewall_output" == *"State = 1"* ]] || [[ "$firewall_output" == *"State = 2"* ]]; then echo -e " ${GREEN}✓${NC} Firewall Network protection enabled" else - echo -e " ${YELLOW}${ICON_WARNING}${NC} Firewall ${YELLOW}Network protection disabled${NC}" + echo -e " ${GRAY}${ICON_WARNING}${NC} Firewall ${YELLOW}Network protection disabled${NC}" export FIREWALL_DISABLED=true fi } @@ -134,7 +134,7 @@ check_gatekeeper() { echo -e " ${GREEN}✓${NC} Gatekeeper App download protection active" unset GATEKEEPER_DISABLED else - echo -e " ${YELLOW}${ICON_WARNING}${NC} Gatekeeper ${YELLOW}App security disabled${NC}" + echo -e " ${GRAY}${ICON_WARNING}${NC} Gatekeeper ${YELLOW}App security disabled${NC}" export GATEKEEPER_DISABLED=true fi fi @@ -149,7 +149,7 @@ check_sip() { if echo "$sip_status" | grep -q "enabled"; then echo -e " ${GREEN}✓${NC} SIP System integrity protected" else - echo -e " ${YELLOW}${ICON_WARNING}${NC} SIP ${YELLOW}System protection disabled${NC}" + echo -e " ${GRAY}${ICON_WARNING}${NC} SIP ${YELLOW}System protection disabled${NC}" fi fi } @@ -276,7 +276,7 @@ check_macos_update() { export MACOS_UPDATE_AVAILABLE="$updates_available" if [[ "$updates_available" == "true" ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} macOS ${YELLOW}Update available${NC}" + echo -e " ${GRAY}${ICON_WARNING}${NC} macOS ${YELLOW}Update available${NC}" else echo -e " ${GREEN}✓${NC} macOS System up to date" fi @@ -344,7 +344,7 @@ check_mole_update() { # Compare versions if [[ "$(printf '%s\n' "$current_version" "$latest_version" | sort -V | head -1)" == "$current_version" ]]; then export MOLE_UPDATE_AVAILABLE="true" - echo -e " ${YELLOW}${ICON_WARNING}${NC} Mole ${YELLOW}${latest_version} available${NC} (running ${current_version})" + echo -e " ${GRAY}${ICON_WARNING}${NC} Mole ${YELLOW}${latest_version} available${NC} (running ${current_version})" else echo -e " ${GREEN}✓${NC} Mole Latest version ${current_version}" fi @@ -408,7 +408,7 @@ check_disk_space() { if [[ $free_num -lt 20 ]]; then echo -e " ${RED}✗${NC} Disk Space ${RED}${free_gb}GB free${NC} (Critical)" elif [[ $free_num -lt 50 ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Disk Space ${YELLOW}${free_gb}GB free${NC} (Low)" + echo -e " ${GRAY}${ICON_WARNING}${NC} Disk Space ${YELLOW}${free_gb}GB free${NC} (Low)" else echo -e " ${GREEN}✓${NC} Disk Space ${free_gb}GB free" fi @@ -454,7 +454,7 @@ check_memory_usage() { if [[ $used_percent -gt 90 ]]; then echo -e " ${RED}✗${NC} Memory ${RED}${used_percent}% used${NC} (Critical)" elif [[ $used_percent -gt 80 ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Memory ${YELLOW}${used_percent}% used${NC} (High)" + echo -e " ${GRAY}${ICON_WARNING}${NC} Memory ${YELLOW}${used_percent}% used${NC} (High)" else echo -e " ${GREEN}✓${NC} Memory ${used_percent}% used" fi @@ -484,7 +484,7 @@ check_login_items() { fi if [[ $login_items_count -gt 15 ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Login Items ${YELLOW}${login_items_count} apps${NC}" + echo -e " ${GRAY}${ICON_WARNING}${NC} Login Items ${YELLOW}${login_items_count} apps${NC}" elif [[ $login_items_count -gt 0 ]]; then echo -e " ${GREEN}✓${NC} Login Items ${login_items_count} apps" else @@ -548,9 +548,9 @@ check_cache_size() { local cache_size_int=$(echo "$cache_size_gb" | cut -d'.' -f1) if [[ $cache_size_int -gt 10 ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Cache Size ${YELLOW}${cache_size_gb}GB${NC} cleanable" + echo -e " ${GRAY}${ICON_WARNING}${NC} Cache Size ${YELLOW}${cache_size_gb}GB${NC} cleanable" elif [[ $cache_size_int -gt 5 ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Cache Size ${YELLOW}${cache_size_gb}GB${NC} cleanable" + echo -e " ${GRAY}${ICON_WARNING}${NC} Cache Size ${YELLOW}${cache_size_gb}GB${NC} cleanable" else echo -e " ${GREEN}✓${NC} Cache Size ${cache_size_gb}GB" fi @@ -568,7 +568,7 @@ check_swap_usage() { if [[ "$swap_used" == *"G"* ]]; then local swap_gb=${swap_num%.*} if [[ $swap_gb -gt 2 ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Swap Usage ${YELLOW}${swap_used}${NC} (High)" + echo -e " ${GRAY}${ICON_WARNING}${NC} Swap Usage ${YELLOW}${swap_used}${NC} (High)" else echo -e " ${GREEN}✓${NC} Swap Usage ${swap_used}" fi diff --git a/lib/clean/app_caches.sh b/lib/clean/app_caches.sh index c4b62c6..2402f09 100644 --- a/lib/clean/app_caches.sh +++ b/lib/clean/app_caches.sh @@ -18,7 +18,7 @@ clean_xcode_tools() { safe_clean ~/Library/Developer/Xcode/DerivedData/* "Xcode derived data" safe_clean ~/Library/Developer/Xcode/Archives/* "Xcode archives" else - echo -e " ${YELLOW}${ICON_WARNING}${NC} Xcode is running, skipping DerivedData and Archives cleanup" + echo -e " ${GRAY}${ICON_WARNING}${NC} Xcode is running, skipping DerivedData and Archives cleanup" fi } # Code editors. @@ -107,7 +107,7 @@ clean_media_players() { fi fi if [[ "$has_offline_music" == "true" ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Spotify cache protected · offline music detected" + echo -e " ${GRAY}${ICON_WARNING}${NC} Spotify cache protected · offline music detected" note_activity else safe_clean ~/Library/Caches/com.spotify.client/* "Spotify cache" diff --git a/lib/clean/apps.sh b/lib/clean/apps.sh index cd06731..2c118e7 100644 --- a/lib/clean/apps.sh +++ b/lib/clean/apps.sh @@ -246,7 +246,7 @@ is_bundle_orphaned() { clean_orphaned_app_data() { if ! ls "$HOME/Library/Caches" > /dev/null 2>&1; then stop_section_spinner - echo -e " ${YELLOW}${ICON_WARNING}${NC} Skipped: No permission to access Library folders" + echo -e " ${GRAY}${ICON_WARNING}${NC} Skipped: No permission to access Library folders" return 0 fi start_section_spinner "Scanning installed apps..." @@ -438,7 +438,7 @@ clean_orphaned_system_services() { # Report and clean if [[ $orphaned_count -gt 0 ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Found $orphaned_count orphaned system services" + echo -e " ${GRAY}${ICON_WARNING}${NC} Found $orphaned_count orphaned system services" for orphan_file in "${orphaned_files[@]}"; do local filename diff --git a/lib/clean/brew.sh b/lib/clean/brew.sh index b30fa7f..9939cb0 100644 --- a/lib/clean/brew.sh +++ b/lib/clean/brew.sh @@ -92,7 +92,7 @@ clean_homebrew() { fi fi elif [[ $brew_exit -eq 124 ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Homebrew cleanup timed out · run ${GRAY}brew cleanup${NC} manually" + echo -e " ${GRAY}${ICON_WARNING}${NC} Homebrew cleanup timed out · run ${GRAY}brew cleanup${NC} manually" fi # Process autoremove output - only show if packages were removed # Only surface autoremove output when packages were removed. @@ -105,7 +105,7 @@ clean_homebrew() { echo -e " ${GREEN}${ICON_SUCCESS}${NC} Removed orphaned dependencies (${removed_packages} packages)" fi elif [[ $autoremove_exit -eq 124 ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Autoremove timed out · run ${GRAY}brew autoremove${NC} manually" + echo -e " ${GRAY}${ICON_WARNING}${NC} Autoremove timed out · run ${GRAY}brew autoremove${NC} manually" fi # Update cache timestamp on successful completion or when cleanup was intelligently skipped # This prevents repeated cache size checks within the 7-day window diff --git a/lib/clean/dev.sh b/lib/clean/dev.sh index 034ffc5..223a380 100644 --- a/lib/clean/dev.sh +++ b/lib/clean/dev.sh @@ -97,7 +97,7 @@ check_multiple_versions() { if [[ -n "$list_cmd" ]]; then hint=" · ${GRAY}${list_cmd}${NC}" fi - echo -e " ${YELLOW}${ICON_WARNING}${NC} ${tool_name}: ${count} found${hint}" + echo -e " ${GRAY}${ICON_WARNING}${NC} ${tool_name}: ${count} found${hint}" fi } diff --git a/lib/clean/system.sh b/lib/clean/system.sh index d834319..a186c67 100644 --- a/lib/clean/system.sh +++ b/lib/clean/system.sh @@ -323,7 +323,7 @@ clean_local_snapshots() { if [[ "$DRY_RUN" != "true" ]]; then if [[ ! -t 0 ]]; then echo -e " ${YELLOW}!${NC} ${#snapshots[@]} local snapshot(s) found, skipping non-interactive mode" - echo -e " ${YELLOW}${ICON_WARNING}${NC} ${GRAY}Tip: Snapshots may cause Disk Utility to show different 'Available' values${NC}" + echo -e " ${GRAY}${ICON_WARNING}${NC} ${GRAY}Tip: Snapshots may cause Disk Utility to show different 'Available' values${NC}" return 0 fi echo -e " ${YELLOW}!${NC} Time Machine local snapshots found" diff --git a/lib/clean/user.sh b/lib/clean/user.sh index 02baef9..c457f65 100644 --- a/lib/clean/user.sh +++ b/lib/clean/user.sh @@ -21,7 +21,7 @@ clean_chrome_old_versions() { # Match the exact Chrome process name to avoid false positives if pgrep -x "Google Chrome" > /dev/null 2>&1; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Google Chrome running · old versions cleanup skipped" + echo -e " ${GRAY}${ICON_WARNING}${NC} Google Chrome running · old versions cleanup skipped" return 0 fi @@ -101,7 +101,7 @@ clean_edge_old_versions() { # Match the exact Edge process name to avoid false positives (e.g., Microsoft Teams) if pgrep -x "Microsoft Edge" > /dev/null 2>&1; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Microsoft Edge running · old versions cleanup skipped" + echo -e " ${GRAY}${ICON_WARNING}${NC} Microsoft Edge running · old versions cleanup skipped" return 0 fi @@ -178,7 +178,7 @@ clean_edge_updater_old_versions() { [[ -d "$updater_dir" ]] || return 0 if pgrep -x "Microsoft Edge" > /dev/null 2>&1; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Microsoft Edge running · updater cleanup skipped" + echo -e " ${GRAY}${ICON_WARNING}${NC} Microsoft Edge running · updater cleanup skipped" return 0 fi @@ -455,7 +455,7 @@ clean_browsers() { firefox_running=true fi if [[ "$firefox_running" == "true" ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Firefox is running · cache cleanup skipped" + echo -e " ${GRAY}${ICON_WARNING}${NC} Firefox is running · cache cleanup skipped" else safe_clean ~/Library/Caches/Firefox/* "Firefox cache" fi @@ -465,7 +465,7 @@ clean_browsers() { safe_clean ~/Library/Caches/com.kagi.kagimacOS/* "Orion cache" safe_clean ~/Library/Caches/zen/* "Zen cache" if [[ "$firefox_running" == "true" ]]; then - echo -e " ${YELLOW}${ICON_WARNING}${NC} Firefox is running · profile cache cleanup skipped" + echo -e " ${GRAY}${ICON_WARNING}${NC} Firefox is running · profile cache cleanup skipped" else safe_clean ~/Library/Application\ Support/Firefox/Profiles/*/cache2/* "Firefox profile cache" fi @@ -506,7 +506,7 @@ clean_virtualization_tools() { clean_application_support_logs() { if [[ ! -d "$HOME/Library/Application Support" ]] || ! ls "$HOME/Library/Application Support" > /dev/null 2>&1; then note_activity - echo -e " ${YELLOW}${ICON_WARNING}${NC} Skipped: No permission to access Application Support" + echo -e " ${GRAY}${ICON_WARNING}${NC} Skipped: No permission to access Application Support" return 0 fi start_section_spinner "Scanning Application Support..." diff --git a/lib/core/sudo.sh b/lib/core/sudo.sh index 31011c6..5431db3 100644 --- a/lib/core/sudo.sh +++ b/lib/core/sudo.sh @@ -78,7 +78,7 @@ _request_password() { unset password ((attempts++)) if [[ $attempts -lt 3 ]]; then - echo -e "${YELLOW}${ICON_WARNING}${NC} Password cannot be empty" > "$tty_path" + echo -e "${GRAY}${ICON_WARNING}${NC} Password cannot be empty" > "$tty_path" fi continue fi @@ -93,7 +93,7 @@ _request_password() { unset password ((attempts++)) if [[ $attempts -lt 3 ]]; then - echo -e "${YELLOW}${ICON_WARNING}${NC} Incorrect password, try again" > "$tty_path" + echo -e "${GRAY}${ICON_WARNING}${NC} Incorrect password, try again" > "$tty_path" fi done diff --git a/lib/manage/autofix.sh b/lib/manage/autofix.sh index d603f02..068add3 100644 --- a/lib/manage/autofix.sh +++ b/lib/manage/autofix.sh @@ -73,7 +73,7 @@ show_suggestions() { # Show auto-fix items if [[ ${#auto_fix_items[@]} -gt 0 ]]; then for item in "${auto_fix_items[@]}"; do - echo -e " ${YELLOW}${ICON_WARNING}${NC} ${item} ${GREEN}[auto]${NC}" + echo -e " ${GRAY}${ICON_WARNING}${NC} ${item} ${GREEN}[auto]${NC}" done fi @@ -82,7 +82,7 @@ show_suggestions() { for item in "${manual_items[@]}"; do local title="${item%%|*}" local hint="${item#*|}" - echo -e " ${YELLOW}${ICON_WARNING}${NC} ${title}" + echo -e " ${GRAY}${ICON_WARNING}${NC} ${title}" echo -e " ${GRAY}${hint}${NC}" done fi diff --git a/lib/uninstall/batch.sh b/lib/uninstall/batch.sh index cf8ba56..5084137 100755 --- a/lib/uninstall/batch.sh +++ b/lib/uninstall/batch.sh @@ -280,7 +280,7 @@ batch_uninstall_applications() { done if [[ "$has_user_data" == "true" ]]; then - echo -e "${YELLOW}${ICON_WARNING}${NC} ${YELLOW}Note: Some apps contain user configurations/themes${NC}" + echo -e "${GRAY}${ICON_WARNING}${NC} ${YELLOW}Note: Some apps contain user configurations/themes${NC}" echo "" fi