1
0
mirror of https://github.com/Tarrasch/zsh-autoenv.git synced 2024-11-05 01:10:59 +02:00

Merge branch 'allow-disable'

Closes: #20
This commit is contained in:
Daniel Hahler 2015-01-20 11:16:37 +01:00
commit e07a47f566

View File

@ -21,6 +21,9 @@ export AUTOENV_ENV_FILENAME=$HOME/.env_auth
# Enable debugging. Multiple levels are supported (max 2). # Enable debugging. Multiple levels are supported (max 2).
: ${AUTOENV_DEBUG:=0} : ${AUTOENV_DEBUG:=0}
# (Temporarily) disable zsh-autoenv. This gets looked at in the chpwd handler.
: ${AUTOENV_DISABLED:=0}
# Public helper functions, which can be used from your .env files: # Public helper functions, which can be used from your .env files:
# #
# Source the next .env file from parent directories. # Source the next .env file from parent directories.
@ -280,10 +283,16 @@ _autoenv_get_file_upwards() {
_autoenv_chpwd_prev_dir=$PWD _autoenv_chpwd_prev_dir=$PWD
_autoenv_chpwd_handler() { _autoenv_chpwd_handler() {
local env_file="$PWD/$AUTOENV_FILE_ENTER"
_autoenv_debug "Calling chpwd handler: PWD=$PWD" _autoenv_debug "Calling chpwd handler: PWD=$PWD"
if (( $AUTOENV_DISABLED )); then
_autoenv_debug "Disabled (AUTOENV_DISABLED)."
return
fi
local env_file="$PWD/$AUTOENV_FILE_ENTER"
_autoenv_debug "env_file: $env_file"
# Handle leave event for previously sourced env files. # Handle leave event for previously sourced env files.
if [[ $AUTOENV_HANDLE_LEAVE == 1 ]] && (( $#_autoenv_stack_entered )); then if [[ $AUTOENV_HANDLE_LEAVE == 1 ]] && (( $#_autoenv_stack_entered )); then
local prev_file prev_dir local prev_file prev_dir