summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Janke <andrew@apjanke.net>2015-10-01 19:29:59 -0400
committerAndrew Janke <andrew@apjanke.net>2015-10-01 19:29:59 -0400
commitc146853a5e529a522ca4cd6015cd55b796788806 (patch)
treeb5d7706e9ecf0f63bd75a17eb7a921ad0f55f3ff
parent56b747aa89a1187395a986f26e17d3f828803bd9 (diff)
downloadzsh-c146853a5e529a522ca4cd6015cd55b796788806.tar.gz
zsh-c146853a5e529a522ca4cd6015cd55b796788806.tar.bz2
zsh-c146853a5e529a522ca4cd6015cd55b796788806.zip
autoenv: also look in the Homebrew installation location for it
-rw-r--r--plugins/autoenv/autoenv.plugin.zsh27
1 files changed, 20 insertions, 7 deletions
diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
index edc16a4ca..c9f968118 100644
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -1,12 +1,25 @@
# Activates autoenv or reports its failure
-if ! type autoenv_init &>/dev/null && ! source $HOME/.autoenv/activate.sh 2>/dev/null; then
- echo '-------- AUTOENV ---------'
- echo 'Could not find autoenv_init function or ~/.autoenv/activate.sh.'
- echo 'Please check if autoenv is correctly installed.'
- echo 'In the meantime the autoenv plugin is DISABLED.'
- echo '--------------------------'
- return 1
+() {
+if ! type autoenv_init >/dev/null; then
+ for d (~/.autoenv /usr/local/opt/autoenv); do
+ if [[ -e $d/activate.sh ]]; then
+ autoenv_dir=$d
+ break
+ fi
+ done
+ if [[ -z $autoenv_dir ]]; then
+ cat <<END >&2
+-------- AUTOENV ---------
+Could not locate autoenv installation.
+Please check if autoenv is correctly installed.
+In the meantime the autoenv plugin is DISABLED.
+--------------------------
+END
+ return 1
+ fi
fi
+}
+[[ $? != 0 ]] && return $?
# The use_env call below is a reusable command to activate/create a new Python
# virtualenv, requiring only a single declarative line of code in your .env files.