style: standardize punctuation across codebase

- Replace parentheses with commas for supplementary info - Use commas instead of em-dashes for separators - Update bullet points from - to * in some contexts - Improve version extraction regex with fallback logic
2026-02-08 08:34:21 +00:00 · 2026-01-26 14:36:06 +08:00
parent a7bad3d79a
commit e966838c82
36 changed files with 219 additions and 205 deletions
--- a/bin/clean.sh
+++ b/bin/clean.sh
@@ -381,7 +381,7 @@ safe_clean() {
        stop_section_spinner
    fi

-    debug_log "Cleaning: $description (${#existing_paths[@]} items)"
+    debug_log "Cleaning: $description, ${#existing_paths[@]} items"

    # Enhanced debug output with risk level and details
    if [[ "${MO_DEBUG:-}" == "1" && ${#existing_paths[@]} -gt 0 ]]; then
@@ -612,7 +612,7 @@ safe_clean() {
        debug_log "Permission denied while cleaning: $description"
    fi
    if [[ $removal_failed_count -gt 0 && "$DRY_RUN" != "true" ]]; then
-        debug_log "Skipped $removal_failed_count items (permission denied or in use) for: $description"
+        debug_log "Skipped $removal_failed_count items, permission denied or in use, for: $description"
    fi

    if [[ $removed_any -eq 1 ]]; then
@@ -627,7 +627,7 @@ safe_clean() {
        fi

        if [[ "$DRY_RUN" == "true" ]]; then
-            echo -e "  ${YELLOW}${ICON_DRY_RUN}${NC} $label ${YELLOW}($size_human dry)${NC}"
+            echo -e "  ${YELLOW}${ICON_DRY_RUN}${NC} $label${NC}, ${YELLOW}$size_human dry${NC}"

            local paths_temp=$(create_temp_file)

@@ -678,7 +678,7 @@ safe_clean() {
                ' | while IFS='|' read -r display_path total_size child_count; do
                    local size_human=$(bytes_to_human "$((total_size * 1024))")
                    if [[ $child_count -gt 1 ]]; then
-                        echo "$display_path  # $size_human ($child_count items)" >> "$EXPORT_LIST_FILE"
+                        echo "$display_path  # $size_human, $child_count items" >> "$EXPORT_LIST_FILE"
                    else
                        echo "$display_path  # $size_human" >> "$EXPORT_LIST_FILE"
                    fi
@@ -687,7 +687,7 @@ safe_clean() {
                rm -f "$paths_temp"
            fi
        else
-            echo -e "  ${GREEN}${ICON_SUCCESS}${NC} $label ${GREEN}($size_human)${NC}"
+            echo -e "  ${GREEN}${ICON_SUCCESS}${NC} $label${NC}, ${GREEN}$size_human${NC}"
        fi
        ((files_cleaned += total_count))
        ((total_size_cleaned += total_size_kb))
@@ -711,7 +711,7 @@ start_cleanup() {
    fi

    if [[ "$DRY_RUN" == "true" ]]; then
-        echo -e "${YELLOW}Dry Run Mode${NC} - Preview only, no deletions"
+        echo -e "${YELLOW}Dry Run Mode${NC}, Preview only, no deletions"
        echo ""
        SYSTEM_CLEAN=false

@@ -737,7 +737,7 @@ EOF
            echo -e "${GREEN}${ICON_SUCCESS}${NC} Admin access already available"
            echo ""
        else
-            echo -ne "${PURPLE}${ICON_ARROW}${NC} System caches need sudo — ${GREEN}Enter${NC} continue, ${GRAY}Space${NC} skip: "
+            echo -ne "${PURPLE}${ICON_ARROW}${NC} System caches need sudo. ${GREEN}Enter${NC} continue, ${GRAY}Space${NC} skip: "

            local choice
            choice=$(read_key)
@@ -774,10 +774,10 @@ EOF
        echo "Running in non-interactive mode"
        if sudo -n true 2> /dev/null; then
            SYSTEM_CLEAN=true
-            echo "  ${ICON_LIST} System-level cleanup enabled (sudo session active)"
+            echo "  ${ICON_LIST} System-level cleanup enabled, sudo session active"
        else
            SYSTEM_CLEAN=false
-            echo "  ${ICON_LIST} System-level cleanup skipped (requires sudo)"
+            echo "  ${ICON_LIST} System-level cleanup skipped, requires sudo"
        fi
        echo "  ${ICON_LIST} User-level cleanup will proceed automatically"
        echo ""
@@ -790,7 +790,7 @@ perform_cleanup() {
    if [[ "${MOLE_TEST_MODE:-0}" == "1" ]]; then
        test_mode_enabled=true
        if [[ "$DRY_RUN" == "true" ]]; then
-            echo -e "${YELLOW}Dry Run Mode${NC} - Preview only, no deletions"
+            echo -e "${YELLOW}Dry Run Mode${NC}, Preview only, no deletions"
            echo ""
        fi
        echo -e "${GREEN}${ICON_LIST}${NC} User app cache"
@@ -1054,7 +1054,7 @@ perform_cleanup() {
    else
        summary_status="info"
        if [[ "$DRY_RUN" == "true" ]]; then
-            summary_details+=("No significant reclaimable space detected (system already clean).")
+            summary_details+=("No significant reclaimable space detected, system already clean.")
        else
            summary_details+=("System was already clean; no additional space freed.")
        fi
--- a/bin/completion.sh
+++ b/bin/completion.sh
@@ -84,7 +84,7 @@ if [[ $# -eq 0 ]]; then
            echo -e "${GREEN}${ICON_SUCCESS}${NC} Removed stale completion entries from $config_file"
            echo ""
        fi
-        log_error "mole not found in PATH - install Mole before enabling completion"
+        log_error "mole not found in PATH, install Mole before enabling completion"
        exit 1
    fi

--- a/bin/installer.sh
+++ b/bin/installer.sh
@@ -387,7 +387,7 @@ select_installers() {
            scroll_indicator=" ${GRAY}[${current_pos}/${total_items}]${NC}"
        fi

-        printf "${PURPLE_BOLD}Select Installers to Remove${NC}%s ${GRAY}- ${selected_human} ($selected_count selected)${NC}\n" "$scroll_indicator"
+        printf "${PURPLE_BOLD}Select Installers to Remove${NC}%s ${GRAY}, ${selected_human}, ${selected_count} selected${NC}\n" "$scroll_indicator"
        printf "%s\n" "$clear_line"

        # Calculate visible range
@@ -546,13 +546,13 @@ delete_selected_installers() {
            local file_size="${INSTALLER_SIZES[$idx]}"
            local size_human
            size_human=$(bytes_to_human "$file_size")
-            echo -e "  ${GREEN}${ICON_SUCCESS}${NC} $(basename "$file_path") ${GRAY}(${size_human})${NC}"
+            echo -e "  ${GREEN}${ICON_SUCCESS}${NC} $(basename "$file_path") ${GRAY}, ${size_human}${NC}"
        fi
    done

    # Confirm deletion
    echo ""
-    echo -ne "${PURPLE}${ICON_ARROW}${NC} Delete ${#selected_indices[@]} installer(s) (${confirm_human})  ${GREEN}Enter${NC} confirm, ${GRAY}ESC${NC} cancel: "
+    echo -ne "${PURPLE}${ICON_ARROW}${NC} Delete ${#selected_indices[@]} installers, ${confirm_human}  ${GREEN}Enter${NC} confirm, ${GRAY}ESC${NC} cancel: "

    IFS= read -r -s -n1 confirm || confirm=""
    case "$confirm" in
@@ -655,7 +655,7 @@ show_summary() {
        local freed_mb
        freed_mb=$(echo "$total_size_freed_kb" | awk '{printf "%.2f", $1/1024}')

-        summary_details+=("Removed ${GREEN}$total_deleted${NC} installer(s), freed ${GREEN}${freed_mb}MB${NC}")
+        summary_details+=("Removed ${GREEN}$total_deleted${NC} installers, freed ${GREEN}${freed_mb}MB${NC}")
        summary_details+=("Your Mac is cleaner now!")
    else
        summary_details+=("No installers were removed")
--- a/bin/optimize.sh
+++ b/bin/optimize.sh
@@ -78,7 +78,7 @@ show_optimization_summary() {
    local total_applied=$((safe_count + confirm_count))

    if [[ "${MOLE_DRY_RUN:-0}" == "1" ]]; then
-        summary_title="Dry Run Complete - No Changes Made"
+        summary_title="Dry Run Complete, No Changes Made"
        summary_details+=("Would apply ${YELLOW}${total_applied:-0}${NC} optimizations")
        summary_details+=("Run without ${YELLOW}--dry-run${NC} to apply these changes")
    else
@@ -115,9 +115,9 @@ show_optimization_summary() {
        fi

        if [[ -n "$key_stat" ]]; then
-            summary_details+=("Applied ${GREEN}${total_applied:-0}${NC} optimizations — ${key_stat}")
+            summary_details+=("Applied ${GREEN}${total_applied:-0}${NC} optimizations, ${key_stat}")
        else
-            summary_details+=("Applied ${GREEN}${total_applied:-0}${NC} optimizations — all services tuned")
+            summary_details+=("Applied ${GREEN}${total_applied:-0}${NC} optimizations, all services tuned")
        fi

        local summary_line3=""
@@ -126,11 +126,11 @@ show_optimization_summary() {
            if [[ -n "${AUTO_FIX_DETAILS:-}" ]]; then
                local detail_join
                detail_join=$(echo "${AUTO_FIX_DETAILS}" | paste -sd ", " -)
-                [[ -n "$detail_join" ]] && summary_line3+=" — ${detail_join}"
+                [[ -n "$detail_join" ]] && summary_line3+=": ${detail_join}"
            fi
            summary_details+=("$summary_line3")
        fi
-        summary_details+=("System fully optimized — faster, more secure and responsive")
+        summary_details+=("System fully optimized")
    fi

    print_summary_block "$summary_title" "${summary_details[@]}"
@@ -226,12 +226,12 @@ cleanup_path() {

    if [[ "$removed" == "true" ]]; then
        if [[ -n "$size_display" ]]; then
-            echo -e "${GREEN}${ICON_SUCCESS}${NC} $label ${GREEN}(${size_display})${NC}"
+            echo -e "${GREEN}${ICON_SUCCESS}${NC} $label${NC}, ${GREEN}${size_display}${NC}"
        else
            echo -e "${GREEN}${ICON_SUCCESS}${NC} $label"
        fi
    else
-        echo -e "${GRAY}${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
 }

@@ -252,7 +252,7 @@ collect_security_fix_actions() {
    fi
    if [[ "${GATEKEEPER_DISABLED:-}" == "true" ]]; then
        if ! is_whitelisted "gatekeeper"; then
-            SECURITY_FIXES+=("gatekeeper|Enable Gatekeeper (App download protection)")
+            SECURITY_FIXES+=("gatekeeper|Enable Gatekeeper, app download protection")
        fi
    fi
    if touchid_supported && ! touchid_configured; then
@@ -304,7 +304,7 @@ apply_firewall_fix() {
        FIREWALL_DISABLED=false
        return 0
    fi
-    echo -e "  ${GRAY}${ICON_WARNING}${NC} Failed to enable firewall (check permissions)"
+    echo -e "  ${GRAY}${ICON_WARNING}${NC} Failed to enable firewall, check permissions"
    return 1
 }

@@ -327,7 +327,7 @@ apply_touchid_fix() {

 perform_security_fixes() {
    if ! ensure_sudo_session "Security changes require admin access"; then
-        echo -e "${GRAY}${ICON_WARNING}${NC} Skipped security fixes (sudo denied)"
+        echo -e "${GRAY}${ICON_WARNING}${NC} Skipped security fixes, sudo denied"
        return 1
    fi

@@ -391,7 +391,7 @@ main() {

    # Dry-run indicator.
    if [[ "${MOLE_DRY_RUN:-0}" == "1" ]]; then
-        echo -e "${YELLOW}${ICON_DRY_RUN} DRY RUN MODE${NC} - No files will be modified\n"
+        echo -e "${YELLOW}${ICON_DRY_RUN} DRY RUN MODE${NC}, No files will be modified\n"
    fi

    if ! command -v jq > /dev/null 2>&1; then
--- a/bin/purge.sh
+++ b/bin/purge.sh
@@ -220,7 +220,7 @@ perform_purge() {

 # Show help message
 show_help() {
-    echo -e "${PURPLE_BOLD}Mole Purge${NC} - Clean old project build artifacts"
+    echo -e "${PURPLE_BOLD}Mole Purge${NC}, Clean old project build artifacts"
    echo ""
    echo -e "${YELLOW}Usage:${NC} mo purge [options]"
    echo ""
@@ -231,7 +231,7 @@ show_help() {
    echo ""
    echo -e "${YELLOW}Default Paths:${NC}"
    for path in "${DEFAULT_PURGE_SEARCH_PATHS[@]}"; do
-        echo "  - $path"
+        echo "  * $path"
    done
 }

--- a/bin/touchid.sh
+++ b/bin/touchid.sh
@@ -141,7 +141,7 @@ enable_touchid() {
                sudo mv "$temp_file" "$PAM_SUDO_FILE"
                log_success "Touch ID migrated to sudo_local"
            else
-                log_success "Touch ID enabled (via sudo_local) - try: sudo ls"
+                log_success "Touch ID enabled, via sudo_local, try: sudo ls"
            fi
            return 0
        else
@@ -188,7 +188,7 @@ enable_touchid() {

    # Apply the changes
    if sudo mv "$temp_file" "$PAM_SUDO_FILE" 2> /dev/null; then
-        log_success "Touch ID enabled - try: sudo ls"
+        log_success "Touch ID enabled, try: sudo ls"
        return 0
    else
        log_error "Failed to enable Touch ID"
@@ -219,7 +219,7 @@ disable_touchid() {
                grep -v "pam_tid.so" "$PAM_SUDO_FILE" > "$temp_file"
                sudo mv "$temp_file" "$PAM_SUDO_FILE"
            fi
-            echo -e "${GREEN}${ICON_SUCCESS} Touch ID disabled (removed from sudo_local)${NC}"
+            echo -e "${GREEN}${ICON_SUCCESS} Touch ID disabled, removed from sudo_local${NC}"
            echo ""
            return 0
        else
--- a/bin/uninstall.sh
+++ b/bin/uninstall.sh
@@ -496,7 +496,7 @@ main() {
            rm -f "$apps_file"
            continue
        fi
-        echo -e "${BLUE}${ICON_CONFIRM}${NC} Selected ${selection_count} app(s):"
+        echo -e "${BLUE}${ICON_CONFIRM}${NC} Selected ${selection_count} apps:"
        local -a summary_rows=()
        local max_name_display_width=0
        local max_size_width=0
--- a/bin/uninstall_lib.sh
+++ b/bin/uninstall_lib.sh
@@ -565,7 +565,7 @@ main() {
            continue
        fi
        # Show selected apps with clean alignment
-        echo -e "${BLUE}${ICON_CONFIRM}${NC} Selected ${selection_count} app(s):"
+        echo -e "${BLUE}${ICON_CONFIRM}${NC} Selected ${selection_count} apps:"
        local -a summary_rows=()
        local max_name_width=0
        local max_size_width=0