diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-10-01 19:20:34 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-10-01 19:20:34 -0400 |
| commit | 56b747aa89a1187395a986f26e17d3f828803bd9 (patch) | |
| tree | bf072860af1def21973bfa7f32d799c755837905 | |
| parent | a9c882094dedfdefb311db5967b974980cec49ec (diff) | |
| parent | b7617b35ffd56243fa6d310886d8effe9f27bfc1 (diff) | |
| download | zsh-56b747aa89a1187395a986f26e17d3f828803bd9.tar.gz zsh-56b747aa89a1187395a986f26e17d3f828803bd9.tar.bz2 zsh-56b747aa89a1187395a986f26e17d3f828803bd9.zip | |
Merge branch 'autoenv-check' of github.com:kudos/oh-my-zsh into autoenv-homebrew
| -rw-r--r-- | plugins/autoenv/autoenv.plugin.zsh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh index a8271849e..edc16a4ca 100644 --- a/plugins/autoenv/autoenv.plugin.zsh +++ b/plugins/autoenv/autoenv.plugin.zsh @@ -1,7 +1,7 @@ # Activates autoenv or reports its failure -if ! source $HOME/.autoenv/activate.sh 2>/dev/null; then +if ! type autoenv_init &>/dev/null && ! source $HOME/.autoenv/activate.sh 2>/dev/null; then echo '-------- AUTOENV ---------' - echo 'Could not find ~/.autoenv/activate.sh.' + 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 '--------------------------' |