Merge f653c54441 into 92aed2e936

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

plugins/brew/README.md

@@ -10,12 +10,17 @@ plugins=(... brew)
 
 ## Shellenv
 
-If `brew` is not found in the PATH, this plugin will attempt to find it in common locations, and execute
+This plugin evaluates Homebrew's shell environment on load to ensure `PATH`, `MANPATH`, `INFOPATH`, and other
-`brew shellenv` to set the environment appropriately. This plugin will also export
+Homebrew variables are up to date:
-`HOMEBREW_PREFIX="$(brew --prefix)"` if not previously defined for convenience.
 
-In case you installed `brew` in a non-common location, you can still set `BREW_LOCATION` variable pointing to
+```zsh
-the `brew` binary before sourcing `oh-my-zsh.sh` and it'll set up the environment.
+eval "$(brew shellenv)"
+```
+
+If `brew` is not already on `PATH`, the plugin will attempt to find it in common locations and run
+`brew shellenv` from there. You can also set a `BREW_LOCATION` variable pointing to the `brew` binary before
+loading Oh My Zsh to override detection. This plugin will also export `HOMEBREW_PREFIX="$(brew --prefix)"`
+if not previously defined for convenience.
 
 ## Aliases
 

plugins/brew/brew.plugin.zsh

@@ -1,4 +1,7 @@
-if (( ! $+commands[brew] )); then
+if (( $+commands[brew] )); then
+  # Brew is already on PATH; still evaluate shellenv to ensure env vars are current
+  eval "$(brew shellenv)"
+else
   if [[ -n "$BREW_LOCATION" ]]; then
     if [[ ! -x "$BREW_LOCATION" ]]; then
       echo "[oh-my-zsh] $BREW_LOCATION is not executable"
@@ -16,9 +19,7 @@ if (( ! $+commands[brew] )); then
     return
   fi
 
-  # Only add Homebrew installation to PATH, MANPATH, and INFOPATH if brew is
+  # Evaluate Homebrew shell environment from discovered brew binary
-  # not already on the path, to prevent duplicate entries. This aligns with
-  # the behavior of the brew installer.sh post-install steps.
   eval "$("$BREW_LOCATION" shellenv)"
   unset BREW_LOCATION
 fi

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" ;;