Browse Source

Merge pull request #4440 from apjanke/autoenv-homebrew

autoenv: support homebrew-installed autoenv
Robby Russell 9 years ago
parent
commit
0be21f025e
1 changed files with 20 additions and 7 deletions
  1. 20 7
      plugins/autoenv/autoenv.plugin.zsh

+ 20 - 7
plugins/autoenv/autoenv.plugin.zsh

@@ -1,12 +1,25 @@
 # Activates autoenv or reports its failure
 # Activates autoenv or reports its failure
-if ! source $HOME/.autoenv/activate.sh 2>/dev/null; then
-  echo '-------- AUTOENV ---------'
-  echo 'Could not find ~/.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
 fi
+}
+[[ $? != 0 ]] && return $?
 
 
 # The use_env call below is a reusable command to activate/create a new Python
 # 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.
 # virtualenv, requiring only a single declarative line of code in your .env files.