Merge 4bcd3b5757 into f84341c574

Add unar as a fallback when unrar is not available for extracting
RAR files. This addresses the issue where unrar has been removed
from Homebrew due to licensing issues.

The extraction now:
- Prefers unrar if available (backward compatible)
- Falls back to unar if unrar is not found
- Shows helpful error message if neither tool is installed

lib/git.zsh

@@ -117,7 +117,7 @@ function _omz_git_prompt_status() {
   fi
 
   # For each status prefix, do a regex comparison
-  for status_prefix in ${(k)prefix_constant_map}; do
+  for status_prefix in "${(@k)prefix_constant_map}"; do
     local status_constant="${prefix_constant_map[$status_prefix]}"
     local status_regex=$'(^|\n)'"$status_prefix"
 

plugins/extract/extract.plugin.zsh

@@ -77,7 +77,15 @@ EOF
       (*.lzma) unlzma "$full_path" ;;
       (*.z) uncompress "$full_path" ;;
       (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl|*.vsix|*.crx|*.pk3|*.pk4) unzip "$full_path" ;;
-      (*.rar) unrar x -ad "$full_path" ;;
+      (*.rar)
+        if (( $+commands[unrar] )); then
+          unrar x -ad "$full_path"
+        elif (( $+commands[unar] )); then
+          unar -o . "$full_path"
+        else
+          echo "extract: cannot extract RAR files: install unrar or unar" >&2
+          success=1
+        fi ;;
       (*.rpm)
         rpm2cpio "$full_path" | cpio --quiet -id ;;
       (*.7z | *.7z.[0-9]* | *.pk7) 7za x "$full_path" ;;

tools/install.sh

@@ -341,6 +341,11 @@ setup_zshrc() {
     # Skip this if the user doesn't want to replace an existing .zshrc
     if [ "$KEEP_ZSHRC" = yes ]; then
       echo "${FMT_YELLOW}Found ${zdot}/.zshrc.${FMT_RESET} ${FMT_GREEN}Keeping...${FMT_RESET}"
+      # Still create a backup for uninstall safety, but don't overwrite the existing .zshrc
+      if [ ! -e "$OLD_ZSHRC" ]; then
+        echo "${FMT_GREEN}Creating backup at ${OLD_ZSHRC} for safe uninstall${FMT_RESET}"
+        cp "$zdot/.zshrc" "$OLD_ZSHRC"
+      fi
       return
     fi
     

tools/uninstall.sh

@@ -35,6 +35,19 @@ if [ -e "$ZSHRC_ORIG" ]; then
   echo "Your original zsh config was restored."
 else
   echo "No original zsh config found"
+  # Check if we have a backup from this uninstall session
+  if [ -e ~/.zshrc.omz-uninstalled-* ]; then
+    echo "However, your .zshrc was backed up during this uninstall."
+    echo "Restoring it automatically..."
+    # Find the most recent backup and restore it
+    LATEST_BACKUP=$(ls -t ~/.zshrc.omz-uninstalled-* 2>/dev/null | head -1)
+    if [ -n "$LATEST_BACKUP" ]; then
+      mv "$LATEST_BACKUP" ~/.zshrc
+      echo "Your .zshrc has been restored from backup."
+    fi
+  else
+    echo "No backup found. You may need to recreate your .zshrc configuration."
+  fi
 fi
 
 echo "Thanks for trying out Oh My Zsh. It's been uninstalled."