fi
if [[ -f ~/.env_auth ]]; then
echo "zsh-autoenv: using deprecated location for AUTOENV_AUTH_FILE." >&2
- echo "Please move it: mv ~/.env_auth ${(D)AUTOENV_AUTH_FILE}." >&2
+ echo "Please move it: mv ~/.env_auth ${(D)AUTOENV_AUTH_FILE}" >&2
AUTOENV_AUTH_FILE=~/.env_auth
fi
fi
# Internal function for debug output. {{{
_autoenv_debug() {
- local msg=$1
+ local msg="$1" # Might trigger a bug in Zsh 5.0.5 with shwordsplit.
local level=${2:-1}
if [[ $AUTOENV_DEBUG -lt $level ]]; then
return
echo "Missing file argument for _autoenv_hash_pair!" >&2
return 1
fi
- env_shasum=$(shasum $env_file | cut -d' ' -f1)
+ env_shasum=$(sha1sum $env_file | cut -d' ' -f1)
fi
echo ":${env_file}:${env_shasum}:1"
}
_autoenv_authorized_env_file() {
local env_file=$1
- local pair=$(_autoenv_hash_pair $env_file)
+ local pair="$(_autoenv_hash_pair $env_file)"
test -f $AUTOENV_AUTH_FILE \
&& \grep -qF $pair $AUTOENV_AUTH_FILE
}
_autoenv_authorize() {
local env_file=${1:A}
_autoenv_deauthorize $env_file
+ [[ -d ${AUTOENV_AUTH_FILE:h} ]] || mkdir -p ${AUTOENV_AUTH_FILE:h}
_autoenv_hash_pair $env_file >>| $AUTOENV_AUTH_FILE
}
# This function can be mocked in tests
_autoenv_ask_for_yes() {
local answer
+
+ # Handle/catch Ctrl-C and return, instead of letting it potentially abort the
+ # shell setup process.
+ setopt localtraps
+ trap 'return 1' INT
+
read answer
if [[ $answer == "yes" ]]; then
return 0
}
_autoenv_source() {
- local env_file=$1
- autoenv_event=$2
- local _autoenv_envfile_dir=${3:-${1:A:h}}
-
- autoenv_from_dir=$OLDPWD
- autoenv_to_dir=$PWD
- autoenv_env_file=$env_file
+ # Public API for the .autoenv.zsh script.
+ local autoenv_env_file=$1
+ local autoenv_event=$2
+ local autoenv_from_dir=$OLDPWD
+ local autoenv_to_dir=$PWD
# Source varstash library once.
+ # XXX: pollutes environment with e.g. `stash`, and `autostash` will cause
+ # an overwritten `stash` function to be called!
if [[ -z "$functions[(I)autostash]" ]]; then
- source ${${funcsourcetrace[1]%:*}:h}/lib/varstash
+ if \grep -qE '\b(autostash|autounstash|stash)\b' $autoenv_env_file; then
+ source ${${funcsourcetrace[1]%:*}:h}/lib/varstash
+ fi
# NOTE: Varstash uses $PWD as default for varstash_dir, we might set it to
- # ${env_file:h}.
+ # ${autoenv_env_file:h}.
fi
# Source the env file.
- _autoenv_debug "== SOURCE: ${bold_color:-}$env_file${reset_color:-}\n PWD: $PWD"
+ _autoenv_debug "== SOURCE: ${bold_color:-}$autoenv_env_file${reset_color:-}\n PWD: $PWD"
: $(( _autoenv_debug_indent++ ))
- source $env_file
+ source $autoenv_env_file
: $(( _autoenv_debug_indent-- ))
_autoenv_debug "== END SOURCE =="
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 autoenv_env_file
- if [[ $autoenv_event == leave ]]; then
- unset autoenv_env_file
+ _autoenv_stack_entered_add $autoenv_env_file
fi
}
if [[ $parent_dir == $last ]]; then
break
fi
- parent_file="${parent_dir}/${look_for}"
+ local parent_file="${parent_dir}/${look_for}"
if [[ -f $parent_file ]]; then
echo $parent_file
fi
# Unstash any autostashed stuff.
- varstash_dir=$prev_dir autounstash
+ if [[ -n "$functions[(I)autostash]" ]]; then
+ varstash_dir=$prev_dir autounstash
+ fi
_autoenv_stack_entered_remove $prev_file
fi