arti/zsh-autoenv
1
0
Fork 0
mirror of https://github.com/Tarrasch/zsh-autoenv.git synced 2024-11-29 09:50:59 +02:00
Code Releases Activity

Remove globals: _autoenv_source_dir, _autoenv_chpwd_prev_dir

Browse Source 
The globals are not necessary and can cause problems with
AUTO_NAME_DIRS.

 - Use funcsourcetrace[1] instead of _autoenv_source_dir.
 - Use OLDPWD instead of _autoenv_chpwd_prev_dir.

Fixes #33.
This commit is contained in:
Daniel Hahler 2015-05-25 17:01:43 +02:00
parent e68a914487
commit 9a2660f939
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
autoenv.zsh
View File

@ -244,21 +244,18 @@ _autoenv_check_authorized_env_file() {
return 0 return 0
} }
# Get directory of this file (absolute, with resolved symlinks).
_autoenv_source_dir=${0:A:h}
_autoenv_source() { _autoenv_source() {
local env_file=$1 local env_file=$1
autoenv_event=$2 autoenv_event=$2
local _autoenv_envfile_dir=${3:-${1:A:h}} local _autoenv_envfile_dir=${3:-${1:A:h}}
autoenv_from_dir=$_autoenv_chpwd_prev_dir autoenv_from_dir=$OLDPWD
autoenv_to_dir=$PWD autoenv_to_dir=$PWD
autoenv_env_file=$env_file autoenv_env_file=$env_file
# Source varstash library once. # Source varstash library once.
if [[ -z "$functions[(I)autostash]" ]]; then if [[ -z "$functions[(I)autostash]" ]]; then
source $_autoenv_source_dir/lib/varstash source ${${funcsourcetrace[1]%:*}:h}/lib/varstash
# NOTE: Varstash uses $PWD as default for varstash_dir, we might set it to # NOTE: Varstash uses $PWD as default for varstash_dir, we might set it to
# ${env_file:h}. # ${env_file:h}.
fi fi
@ -309,7 +306,6 @@ _autoenv_get_file_upwards() {
} }
_autoenv_chpwd_prev_dir=$PWD
_autoenv_chpwd_handler() { _autoenv_chpwd_handler() {
_autoenv_debug "Calling chpwd handler: PWD=$PWD" _autoenv_debug "Calling chpwd handler: PWD=$PWD"
@ -343,7 +339,6 @@ _autoenv_chpwd_handler() {
if ! [[ -f $env_file ]] && [[ $AUTOENV_LOOK_UPWARDS == 1 ]]; then if ! [[ -f $env_file ]] && [[ $AUTOENV_LOOK_UPWARDS == 1 ]]; then
env_file=$(_autoenv_get_file_upwards $PWD) env_file=$(_autoenv_get_file_upwards $PWD)
if [[ -z $env_file ]]; then if [[ -z $env_file ]]; then
_autoenv_chpwd_prev_dir=$PWD
return return
fi fi
fi fi
@ -352,12 +347,10 @@ _autoenv_chpwd_handler() {
# directories. # directories.
if _autoenv_stack_entered_contains $env_file; then if _autoenv_stack_entered_contains $env_file; then
_autoenv_debug "Already in stack: $env_file" _autoenv_debug "Already in stack: $env_file"
_autoenv_chpwd_prev_dir=$PWD
return return
fi fi
if ! _autoenv_check_authorized_env_file $env_file; then if ! _autoenv_check_authorized_env_file $env_file; then
_autoenv_chpwd_prev_dir=$PWD
return return
fi fi
@ -365,8 +358,6 @@ _autoenv_chpwd_handler() {
_autoenv_debug "Sourcing from chpwd handler: $env_file" _autoenv_debug "Sourcing from chpwd handler: $env_file"
_autoenv_source $env_file enter _autoenv_source $env_file enter
_autoenv_chpwd_prev_dir=$PWD
: $(( _autoenv_debug_indent++ )) : $(( _autoenv_debug_indent++ ))
} }
# }}} # }}}