Merge pull request #19 from Tarrasch/fix-symlink-handling

[zsh-autoenv.git] / autoenv.zsh

diff --git a/autoenv.zsh b/autoenv.zsh
index 7d6e14282ddcf987ef0af6d1108c3087f523f8e3..c569ef813294372b3a467db7a5996d8e79dc4b1a 100644 (file)
--- a/autoenv.zsh
+++ b/autoenv.zsh
@@ -26,7 +26,7 @@ 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
@@ -74,11 +74,24 @@ _autoenv_stack_entered_remove() {
 }
 
 # Is the given entry already in the stack?
+# This checks for the env_file ($1) as-is and with symlinks resolved.
 _autoenv_stack_entered_contains() {
   local env_file=$1
+  local f i
   if (( ${+_autoenv_stack_entered[(r)${env_file}]} )); then
     # Entry is in stack.
-    if [[ $_autoenv_stack_entered_mtime[$env_file] == $(_autoenv_get_file_mtime $env_file) ]]; then
+    f=$env_file
+  else
+    for i in $_autoenv_stack_entered; do
+      if [[ ${i:A} == ${env_file:A} ]]; then
+        # Entry is in stack (compared with resolved symlinks).
+        f=$i
+        break
+      fi
+    done
+  fi
+  if [[ -n $f ]]; then
+    if [[ $_autoenv_stack_entered_mtime[$f] == $(_autoenv_get_file_mtime $f) ]]; then
       # Entry has the expected mtime.
       return
     fi
@@ -212,6 +225,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
@@ -222,13 +236,11 @@ _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_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
@@ -237,7 +249,7 @@ _autoenv_source() {
   # 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,8 +288,8 @@ _autoenv_chpwd_handler() {
   if [[ $AUTOENV_HANDLE_LEAVE == 1 ]] && (( $#_autoenv_stack_entered )); then
     local prev_file prev_dir
     for prev_file in ${_autoenv_stack_entered}; do
-      prev_dir=${prev_file:A:h}
-      if ! [[ ${PWD:A}/ == ${prev_dir}/* ]]; then
+      prev_dir=${prev_file:h}
+      if ! [[ ${PWD}/ == ${prev_dir}/* ]]; then
         local env_file_leave=$prev_dir/$AUTOENV_FILE_LEAVE
         if _autoenv_check_authorized_env_file $env_file_leave; then
           _autoenv_source $env_file_leave leave $prev_dir