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

Streamline cwd behavior while sourcing

Browse Source
This commit is contained in:
Daniel Hahler 2014-11-21 22:33:00 +01:00
parent 67e8030770
commit dbfb8fe519
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autoenv.zsh
View File

@ -96,7 +96,9 @@ _dotenv_this_dir=${0:A:h}
_dotenv_source() { _dotenv_source() {
local env_file=$1 local env_file=$1
_dotenv_event=$2 _dotenv_event=$2
_dotenv_cwd=$3 _dotenv_envfile_dir=$3
_dotenv_from_dir=$_dotenv_chpwd_prev_dir
_dotenv_to_dir=$PWD
# Source varstash library once. # Source varstash library once.
if [[ $_dotenv_sourced_varstash == 0 ]]; then if [[ $_dotenv_sourced_varstash == 0 ]]; then
@ -108,13 +110,14 @@ _dotenv_source() {
# Change to directory of env file, source it and cd back. # Change to directory of env file, source it and cd back.
local new_dir=$PWD local new_dir=$PWD
builtin cd -q $_dotenv_cwd builtin cd -q $_dotenv_envfile_dir
source $env_file source $env_file
builtin cd -q $new_dir builtin cd -q $new_dir
unset _dotenv_event _dotenv_cwd unset _dotenv_event _dotenv_from_dir
} }
_dotenv_chpwd_prev_dir=$PWD
_dotenv_chpwd_handler() { _dotenv_chpwd_handler() {
local env_file="$PWD/$DOTENV_FILE_ENTER" local env_file="$PWD/$DOTENV_FILE_ENTER"
@ -140,11 +143,13 @@ _dotenv_chpwd_handler() {
if (( $#m )); then if (( $#m )); then
env_file=${${m[1]}:A} env_file=${${m[1]}:A}
else else
_dotenv_chpwd_prev_dir=$PWD
return return
fi fi
fi fi
if ! _dotenv_check_authorized_env_file $env_file; then if ! _dotenv_check_authorized_env_file $env_file; then
_dotenv_chpwd_prev_dir=$PWD
return return
fi fi
@ -152,12 +157,15 @@ _dotenv_chpwd_handler() {
# is in $_dotenv_stack_entered. # is in $_dotenv_stack_entered.
local env_file_dir=${env_file:A:h} local env_file_dir=${env_file:A:h}
if (( ${+_dotenv_stack_entered[(r)${env_file_dir}]} )); then if (( ${+_dotenv_stack_entered[(r)${env_file_dir}]} )); then
_dotenv_chpwd_prev_dir=$PWD
return return
fi fi
_dotenv_stack_entered+=(${env_file_dir}) _dotenv_stack_entered+=(${env_file_dir})
_dotenv_source $env_file enter $PWD _dotenv_source $env_file enter $PWD
_dotenv_chpwd_prev_dir=$PWD
} }
autoload -U add-zsh-hook autoload -U add-zsh-hook

12
tests/cwd.t
View File

@ -1,4 +1,4 @@
Test $PWD and $_dotenv_cwd. Test $PWD, $_dotenv_from_dir and _dotenv_to_dir.
$ source $TESTDIR/setup.sh $ source $TESTDIR/setup.sh
@ -7,8 +7,8 @@ Setup env actions / output.
$ DOTENV_LOOK_UPWARDS=1 $ DOTENV_LOOK_UPWARDS=1
$ mkdir -p sub/sub2 $ mkdir -p sub/sub2
$ cd sub $ cd sub
$ echo 'echo ENTERED: cwd:${PWD:t} ${_dotenv_cwd:t}' >> .env $ echo 'echo ENTERED: PWD:${PWD:t} from:${_dotenv_from_dir:t} to:${_dotenv_to_dir:t}' > .env
$ echo 'echo LEFT: cwd:${PWD:t} ${_dotenv_cwd:t}' >> .env.leave $ echo 'echo LEFT: PWD:${PWD:t} from:${_dotenv_from_dir:t} to:${_dotenv_to_dir:t}' > .env.leave
Manually create auth files. Manually create auth files.
@ -17,10 +17,10 @@ Manually create auth files.
The actual tests. The actual tests.
$ cd . $ cd .
ENTERED: cwd:sub sub ENTERED: PWD:sub from:sub to:sub
$ cd .. $ cd ..
LEFT: cwd:sub cwd.t LEFT: PWD:sub from:sub to:cwd.t
$ cd sub/sub2 $ cd sub/sub2
ENTERED: cwd:sub sub2 ENTERED: PWD:sub2 from:cwd.t to:sub2