mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-12 15:34:50 +08:00
Code Issues Releases Wiki Activity

Compare commits

base: mirrors:49d63a7a2d0ce21c2b97b137e884491df42fa2a6
Branches Tags
mirrors:master
...
compare: mirrors:573bde2f7b940543a49601e038a9d19e884e81b7
Branches Tags
mirrors:master

3 Commits
49d63a7a2d ... 573bde2f7b

Author SHA1 Message Date
Divyaranjan Sahoo
573bde2f7b
Merge f653c54441 into f84341c574 2025-12-11 19:47:19 +01:00
tDwtp
f84341c574
fix(git): git_status_prompt should respect spaces in prefixes (#13478) 2025-12-11 15:05:23 +01:00
Divyaranjan Sahoo
f653c54441 brew: always eval brew shellenv to keep env vars current even if brew is on PATH; update README 2025-09-17 12:54:00 +05:30
3 changed files with 16 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
lib/git.zsh
View File

@ -117,7 +117,7 @@ function _omz_git_prompt_status() {
fi fi
# For each status prefix, do a regex comparison # 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_constant="${prefix_constant_map[$status_prefix]}"
local status_regex=$'(^|\n)'"$status_prefix" local status_regex=$'(^|\n)'"$status_prefix"

15
plugins/brew/README.md
View File

@ -10,12 +10,17 @@ plugins=(... brew)
## Shellenv ## 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 ## Aliases

9
plugins/brew/brew.plugin.zsh
View File

@ -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 [[ -n "$BREW_LOCATION" ]]; then
if [[ ! -x "$BREW_LOCATION" ]]; then if [[ ! -x "$BREW_LOCATION" ]]; then
echo "[oh-my-zsh] $BREW_LOCATION is not executable" echo "[oh-my-zsh] $BREW_LOCATION is not executable"
@ -16,9 +19,7 @@ if (( ! $+commands[brew] )); then
return return
fi 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)" eval "$("$BREW_LOCATION" shellenv)"
unset BREW_LOCATION unset BREW_LOCATION
fi fi