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
# This is useful if you want to use a base .autoenv.zsh file for a directory
# subtree.
autoenv_source_parent() {
- local parent_env_file=$(_autoenv_get_file_upwards ${autoenv_env_file:h})
+ local look_until=${1:-/}
+ local parent_env_file=$(_autoenv_get_file_upwards \
+ ${autoenv_env_file:h} ${AUTOENV_FILE_ENTER} $look_until)
if [[ -n $parent_env_file ]] \
&& _autoenv_check_authorized_env_file $parent_env_file; then
# 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
# }}}
-# Generate hash pair for a given file ($1).
-# A fixed hash value can be given as 2nd arg, but is used with tests only.
+# Generate hash pair for a given file ($1) and version ($2).
+# A fixed hash value can be given as 3rd arg, but is used with tests only.
# The format is ":$file:$hash:$version".
_autoenv_hash_pair() {
local env_file=${1:A}
- local env_shasum=${2:-}
- if [[ -z $env_shasum ]]; then
+ local cksum_version=${2:-2}
+ local env_cksum=${3:-}
+ if [[ -z $env_cksum ]]; then
if ! [[ -e $env_file ]]; then
echo "Missing file argument for _autoenv_hash_pair!" >&2
return 1
fi
- env_shasum=$(shasum $env_file | cut -d' ' -f1)
+ if [ $cksum_version = 2 ]; then
+ # Get the output from `cksum` and join the first two words with a dot.
+ env_cksum=${(j:.:)${:-$(cksum "$env_file")}[1,2]}
+ elif [ $cksum_version = 1 ]; then
+ env_cksum=$(shasum $env_file | cut -d' ' -f1)
+ else
+ echo "Invalid version argument (${cksum_version}) for _autoenv_hash_pair!" >&2
+ return 1
+ fi
fi
- echo ":${env_file}:${env_shasum}:1"
+ echo ":${env_file}:${env_cksum}:${cksum_version}"
}
-_autoenv_authorized_env_file() {
- local env_file=$1
- local pair=$(_autoenv_hash_pair $env_file)
+
+# Checks for the existence of a hash signature in the auth file
+_autoenv_authorized_pair() {
+ local pair=$1
test -f $AUTOENV_AUTH_FILE \
&& \grep -qF $pair $AUTOENV_AUTH_FILE
}
+
+_autoenv_authorized_env_file() {
+ local env_file=$1
+ local pair
+ pair=$(_autoenv_hash_pair $env_file)
+ _autoenv_debug "v2 pair: ${pair}"
+ if ! _autoenv_authorized_pair $pair; then
+ # Fallback for v1 (SHA-1) pairs
+ pair=$(_autoenv_hash_pair $env_file 1)
+ _autoenv_debug "v1 pair: ${pair}"
+ if _autoenv_authorized_pair $pair; then
+ # Upgrade v1 entries to v2
+ _autoenv_authorize $env_file
+ else
+ return 1
+ fi
+ fi
+}
+
_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
}
# Deauthorize a given filename, by removing it from the auth file.
-# This uses `test -s` to only handle non-empty files, and a subshell to
-# allow for writing to the same file again.
+# This uses `test -s` to only handle non-empty files.
_autoenv_deauthorize() {
local env_file=${1:A}
if [[ -s $AUTOENV_AUTH_FILE ]]; then
- echo "$(\grep -vF :${env_file}: $AUTOENV_AUTH_FILE)" >| $AUTOENV_AUTH_FILE
+ \grep -vF :${env_file}: $AUTOENV_AUTH_FILE >| $AUTOENV_AUTH_FILE.tmp
+ \mv $AUTOENV_AUTH_FILE.tmp $AUTOENV_AUTH_FILE
fi
}
# 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
if ! _autoenv_authorized_env_file $1; then
echo "Attempting to load unauthorized env file!" >&2
command ls -l $1 >&2
- echo "" >&2
+ echo >&2
echo "**********************************************" >&2
- echo "" >&2
+ echo >&2
command cat $1 >&2
- echo "" >&2
+ echo >&2
echo "**********************************************" >&2
- echo "" >&2
+ echo >&2
echo -n "Would you like to authorize it? (type 'yes') " >&2
# echo "Would you like to authorize it?"
# echo "('yes' to allow, 'no' to not being asked again; otherwise ignore it for the shell) "
}
_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
}
_autoenv_get_file_upwards() {
local look_from=${1:-$PWD}
local look_for=${2:-$AUTOENV_FILE_ENTER}
+ local look_until=${${3:-/}:A}
# Manually look in parent dirs. An extended Zsh glob should use Y1 for
# performance reasons, which is only available in zsh-5.0.5-146-g9381bb6.
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
break
fi
+ if [[ $parent_dir == $look_until ]]; then
+ break
+ fi
last=$parent_dir
parent_dir="${parent_dir}/.."
done
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