Merge pull request #17 from Tarrasch/dont-cd-in-chpwd

[zsh-autoenv.git] / autoenv.zsh

diff --git a/autoenv.zsh b/autoenv.zsh
index f87f350ba99bed31f9add25f27b4e8529e3af7a0..561a336072af656ae2fd1d8999f742b0d2a89480 100644 (file)
--- a/autoenv.zsh
+++ b/autoenv.zsh
@@ -2,6 +2,7 @@
 # https://github.com/joshuaclayton/dotfiles/blob/master/zsh_profile.d/autoenv.zsh
 
 export AUTOENV_ENV_FILENAME=$HOME/.env_auth
+[ -e $AUTOENV_ENV_FILENAME ] || touch $AUTOENV_ENV_FILENAME
 
 # Name of file to look for when entering directories.
 : ${AUTOENV_FILE_ENTER:=.env}
@@ -25,35 +26,32 @@ export AUTOENV_ENV_FILENAME=$HOME/.env_auth
 # Source the next .env file from parent directories.
 # This is useful if you want to use a base .env file for a directory subtree.
 autoenv_source_parent() {
-  local parent_env_file=$(_autoenv_get_file_upwards $PWD)
+  local parent_env_file=$(_autoenv_get_file_upwards ${autoenv_env_file:h})
 
   if [[ -n $parent_env_file ]] \
     && _autoenv_check_authorized_env_file $parent_env_file; then
     _autoenv_debug "Calling autoenv_source_parent: parent_env_file:$parent_env_file"
-
-    local parent_env_dir=${parent_env_file:A:h}
-
-    _autoenv_stack_entered_add $parent_env_file
-
-    _autoenv_source $parent_env_file enter $parent_env_dir
+    _autoenv_source $parent_env_file enter
   fi
 }
 
 # Internal functions. {{{
 # Internal: stack of entered (and handled) directories. {{{
+typeset -g -a _autoenv_stack_entered
 _autoenv_stack_entered=()
-typeset -A _autoenv_stack_entered_mtime
+# -g: make it global, this is required when used with antigen.
+typeset -g -A _autoenv_stack_entered_mtime
 _autoenv_stack_entered_mtime=()
 
 # Add an entry to the stack, and remember its mtime.
 _autoenv_stack_entered_add() {
   local env_file=$1
 
-  _autoenv_debug "[stack] adding: $env_file" 2
-
   # Remove any existing entry.
   _autoenv_stack_entered_remove $env_file
 
+  _autoenv_debug "[stack] adding: $env_file" 2
+
   # Append it to the stack, and remember its mtime.
   _autoenv_stack_entered+=($env_file)
   _autoenv_stack_entered_mtime[$env_file]=$(_autoenv_get_file_mtime $env_file)
@@ -97,7 +95,7 @@ _autoenv_debug() {
     return
   fi
   # Load zsh color support.
-  if [[ -z $colors ]]; then
+  if [[ -z $color ]]; then
     autoload colors
     colors
   fi
@@ -119,17 +117,22 @@ _autoenv_debug() {
 # }}}
 
 # Load zstat module, but only its builtin `zstat`.
-zmodload -F zsh/stat b:zstat
+if ! zmodload -F zsh/stat b:zstat 2>/dev/null; then
+  # If the module is not available, define a wrapper around `stat`, and use its
+  # terse output instead of format, which is not supported by busybox.
+  # Assume '+mtime' as $1.
+  zstat() {
+    stat -t $2 | cut -f13 -d ' '
+  }
+fi
 
 
 # Generate hash pair for a given file ($1).
 # A fixed hash value can be given as 2nd arg, but is used with tests only.
 _autoenv_hash_pair() {
   local env_file=${1:A}
-  local env_shasum
-  if [[ -n $2 ]]; then
-    env_shasum=$2
-  else
+  local env_shasum=${2:-}
+  if [[ -z $env_shasum ]]; then
     if ! [[ -e $env_file ]]; then
       echo "Missing file argument for _autoenv_hash_pair!" >&2
       return 1
@@ -149,7 +152,7 @@ _autoenv_authorized_env_file() {
 _autoenv_authorize() {
   local env_file=${1:A}
   _autoenv_deauthorize $env_file
-  _autoenv_hash_pair $env_file >> $AUTOENV_ENV_FILENAME
+  _autoenv_hash_pair $env_file >>| $AUTOENV_ENV_FILENAME
 }
 
 # Deauthorize a given filename, by removing it from the auth file.
@@ -158,7 +161,7 @@ _autoenv_authorize() {
 _autoenv_deauthorize() {
   local env_file=${1:A}
   if [[ -s $AUTOENV_ENV_FILENAME ]]; then
-    echo "$(\grep -vF :${env_file}: $AUTOENV_ENV_FILENAME)" > $AUTOENV_ENV_FILENAME
+    echo "$(\grep -vF :${env_file}: $AUTOENV_ENV_FILENAME)" >| $AUTOENV_ENV_FILENAME
   fi
 }
 
@@ -209,6 +212,7 @@ _autoenv_source() {
 
   autoenv_from_dir=$_autoenv_chpwd_prev_dir
   autoenv_to_dir=$PWD
+  autoenv_env_file=$env_file
 
   # Source varstash library once.
   if [[ -z "$functions[(I)autostash]" ]]; then
@@ -219,18 +223,20 @@ _autoenv_source() {
 
   # Change to directory of env file, source it and cd back.
   local new_dir=$PWD
-  builtin cd -q $_autoenv_envfile_dir
-  _autoenv_debug "== SOURCE: ${bold_color}$env_file${reset_color}\n      PWD: $PWD"
+  _autoenv_debug "== SOURCE: ${bold_color:-}$env_file${reset_color:-}\n      PWD: $PWD"
   (( _autoenv_debug_indent++ ))
   source $env_file
   (( _autoenv_debug_indent-- ))
   _autoenv_debug "== END SOURCE =="
-  builtin cd -q $new_dir
+
+  if [[ $autoenv_event == enter ]]; then
+    _autoenv_stack_entered_add $env_file
+  fi
 
   # Unset vars set for enter/leave scripts.
   # This should not get done for recursion (via autoenv_source_parent),
   # and can be useful to have in general after autoenv was used.
-  # unset autoenv_event autoenv_from_dir autoenv_to_dir
+  # unset autoenv_event autoenv_from_dir autoenv_to_dir autoenv_env_file
 }
 
 _autoenv_get_file_upwards() {
@@ -276,7 +282,7 @@ _autoenv_chpwd_handler() {
           _autoenv_source $env_file_leave leave $prev_dir
         fi
 
-        # Unstash any autostash'd stuff.
+        # Unstash any autostashed stuff.
         varstash_dir=$prev_dir autounstash
 
         _autoenv_stack_entered_remove $prev_file
@@ -305,8 +311,6 @@ _autoenv_chpwd_handler() {
     return
   fi
 
-  _autoenv_stack_entered_add $env_file
-
   # Source the enter env file.
   _autoenv_debug "Sourcing from chpwd handler: $env_file"
   _autoenv_source $env_file enter