kevin/ohmyzsh
1
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-15 01:48:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

feat(autoenv): macOS compatibility, add more dirs (#11724)

Browse Source 
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
This commit is contained in:
Diego Costa R 2023-06-05 04:25:17 -04:00 committed by GitHub
parent 62ab5406dd
commit b36c90d9ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/autoenv/autoenv.plugin.zsh
View File

@ -17,9 +17,13 @@ if ! type autoenv_init >/dev/null; then
/usr/local/bin /usr/local/bin
/usr/share/autoenv-git /usr/share/autoenv-git
~/Library/Python/bin ~/Library/Python/bin
.venv/bin
venv/bin
env/bin
.env/bin
) )
for d ( $install_locations ); do for d ( $install_locations ); do
if [[ -e $d/activate.sh ]]; then if [[ -e $d/activate || -e $d/activate.sh ]]; then
autoenv_dir=$d autoenv_dir=$d
break break
fi fi
@ -29,13 +33,13 @@ if ! type autoenv_init >/dev/null; then
# Look for Homebrew path as a last resort # Look for Homebrew path as a last resort
if [[ -z "$autoenv_dir" ]] && (( $+commands[brew] )); then if [[ -z "$autoenv_dir" ]] && (( $+commands[brew] )); then
d=$(brew --prefix)/opt/autoenv d=$(brew --prefix)/opt/autoenv
if [[ -e $d/activate.sh ]]; then if [[ -e $d/activate || -e $d/activate.sh ]]; then
autoenv_dir=$d autoenv_dir=$d
fi fi
fi fi
# Complain if autoenv is not installed # Complain if autoenv is not installed
if [[ -z $autoenv_dir ]]; then if [[ -z $autoenv_dir ]]; then
cat <<END >&2 cat <<END >&2
-------- AUTOENV --------- -------- AUTOENV ---------
Could not locate autoenv installation. Could not locate autoenv installation.
@ -46,7 +50,11 @@ END
return 1 return 1
fi fi
# Load autoenv # Load autoenv
source $autoenv_dir/activate.sh if [[ -e $autoenv_dir/activate ]];
source $autoenv_dir/activate
else
source $autoenv_dir/activate.sh
fi
fi fi
} }
[[ $? != 0 ]] && return $? [[ $? != 0 ]] && return $?