fi
}
+autoenv_append_path() {
+ local i
+ for i; do
+ (( ${path[(i)$i]} <= ${#path} )) && continue
+ path+=($i)
+ done
+}
+autoenv_prepend_path() {
+ local i
+ for i; do
+ (( ${path[(i)$i]} <= ${#path} )) && continue
+ path=($i $path)
+ done
+}
+autoenv_remove_path() {
+ local i
+ local old_path=$path
+ for i; do
+ path=("${(@)path:#$i}")
+ done
+ [[ $old_path != $path ]]
+}
+
# Internal functions. {{{
# Internal: stack of loaded env files (i.e. entered directories). {{{
typeset -g -a _autoenv_stack_entered
# Remove any existing entry.
_autoenv_stack_entered_remove $env_file
- _autoenv_debug "[stack] adding: $env_file" 2
-
# Append it to the stack, and remember its mtime.
+ _autoenv_debug "[stack] adding: $env_file" 2
_autoenv_stack_entered+=($env_file)
_autoenv_stack_entered_mtime[$env_file]=$(_autoenv_get_file_mtime $env_file)
}
-
# zstat_mime helper, conditionally defined.
# Load zstat module, but only its builtin `zstat`.
if ! zmodload -F zsh/stat b:zstat 2>/dev/null; then
}
fi
-
# Remove an entry from the stack.
_autoenv_stack_entered_remove() {
local env_file=$1
# Entry is in stack.
f=$env_file
else
+ local env_file_abs=${env_file:A}
for i in $_autoenv_stack_entered; do
- if [[ ${i:A} == ${env_file:A} ]]; then
+ if [[ ${i:A} == ${env_file_abs} ]]; then
# Entry is in stack (compared with resolved symlinks).
f=$i
break
# Internal function for debug output. {{{
_autoenv_debug() {
- local msg="$1" # Might trigger a bug in Zsh 5.0.5 with shwordsplit.
local level=${2:-1}
- if [[ $AUTOENV_DEBUG -lt $level ]]; then
+ if (( AUTOENV_DEBUG < level )); then
return
fi
+ local msg="$1" # Might trigger a bug in Zsh 5.0.5 with shwordsplit.
# Load zsh color support.
if [[ -z $color ]]; then
autoload colors
local env_file=${1:A}
local cksum_version=${2:-2}
local env_cksum=${3:-}
+ ret_pair=
if [[ -z $env_cksum ]]; then
if ! [[ -e $env_file ]]; then
echo "Missing file argument for _autoenv_hash_pair!" >&2
return 1
fi
- if [ $cksum_version = 2 ]; then
+ 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)
+ elif [[ $cksum_version = 1 ]]; then
+ env_cksum=$(sha1sum $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_cksum}:${cksum_version}"
-}
-
-
-# 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
+ ret_pair=":${env_file}:${env_cksum}:${cksum_version}"
}
+# Check if a given env_file is authorized.
_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
+ local env_file_abs=${env_file:A}
+ local ret_pair
+
+ local -a lines
+ if [[ -f $AUTOENV_AUTH_FILE ]]; then
+ lines=( ${(M)"${(f@)"$(< $AUTOENV_AUTH_FILE)"}":#:$env_file_abs:*} )
+ fi
+ if [[ -z $lines ]]; then
+ return 1
+ fi
+
+ if (( $#lines != 1 )); then
+ echo "zsh-autoenv: found unexpected number ($#lines) of auth entries for $env_file in $AUTOENV_AUTH_FILE." >&2
+ echo $lines
+ fi
+ line=${lines[-1]}
+
+ if [[ $line == *:2 ]]; then
+ _autoenv_hash_pair $env_file
+ _autoenv_debug "Checking v2 pair: ${ret_pair}"
+ if [[ $line == $ret_pair ]]; then
+ return
+ fi
+ elif [[ $line == *:1 ]]; 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
+ _autoenv_debug "Checking v1 pair: ${ret_pair}"
+ _autoenv_hash_pair $env_file 1
+ if [[ $line == $ret_pair ]]; then
# Upgrade v1 entries to v2
_autoenv_authorize $env_file
- else
- return 1
+ return
fi
fi
+ return 1
}
_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
+ {
+ local ret_pair
+ _autoenv_hash_pair $env_file && echo "$ret_pair"
+ } >>| $AUTOENV_AUTH_FILE
}
# Deauthorize a given filename, by removing it from the auth file.
# XXX: pollutes environment with e.g. `stash`, and `autostash` will cause
# an overwritten `stash` function to be called!
if ! (( $+functions[autostash] )); then
- if \grep -qE '\b(autostash|autounstash|stash)\b' $autoenv_env_file; then
+ if \grep -qE '\b(autostash|autounstash|stash|unstash)\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
- # ${autoenv_env_file:h}.
fi
# Source the env file.
- _autoenv_debug "== SOURCE: ${bold_color:-}$autoenv_env_file${reset_color:-}\n PWD: $PWD"
- : $(( _autoenv_debug_indent++ ))
+ _autoenv_debug "== SOURCE: $autoenv_event: ${bold_color:-}$autoenv_env_file${reset_color:-} (in $PWD)"
+ (( ++_autoenv_debug_indent ))
local restore_xtrace
if [[ $AUTOENV_DEBUG -gt 2 && ! -o xtrace ]]; then
restore_xtrace=1
setopt localoptions xtrace
fi
- source $autoenv_env_file
+
+ varstash_dir=${autoenv_env_file:h} source $autoenv_env_file
if (( restore_xtrace )); then
setopt noxtrace
fi
- : $(( _autoenv_debug_indent-- ))
+ (( --_autoenv_debug_indent ))
_autoenv_debug "== END SOURCE =="
if [[ $autoenv_event == enter ]]; then
if [[ ${parent_file[1,2]} == './' ]]; then
echo ${parent_file#./}
else
- echo ${parent_file:A}
+ echo ${parent_file:a}
fi
break
fi
if [[ $abs_parent_dir == $look_until ]]; then
break
fi
- last=$parent_dir
+ last=$abs_parent_dir
parent_dir="${parent_dir}/.."
done
}
autoenv-edit() {
+ emulate -L zsh
local env_file
local -a files
local -A check
}
_autoenv_chpwd_handler() {
+ emulate -L zsh
_autoenv_debug "Calling chpwd handler: PWD=$PWD"
if (( $AUTOENV_DISABLED )); then
fi
local env_file="$PWD/$AUTOENV_FILE_ENTER"
- _autoenv_debug "env_file: $env_file"
+ _autoenv_debug "Looking for env_file: $env_file"
# Handle leave event for previously sourced env files.
if [[ $AUTOENV_HANDLE_LEAVE == 1 ]] && (( $#_autoenv_stack_entered )); then
prev_dir=${prev_file:h}
if ! [[ ${PWD}/ == ${prev_dir}/* ]]; then
local env_file_leave=$prev_dir/$AUTOENV_FILE_LEAVE
+ _autoenv_debug "Handling leave event: $env_file_leave"
if _autoenv_check_authorized_env_file $env_file_leave; then
- _autoenv_source $env_file_leave leave $prev_dir
+ varstash_dir=$prev_dir _autoenv_source $env_file_leave leave $prev_dir
fi
# Unstash any autostashed stuff.
if ! [[ -f $env_file ]] && [[ $AUTOENV_LOOK_UPWARDS == 1 ]]; then
env_file=$(_autoenv_get_file_upwards $PWD)
if [[ -z $env_file ]]; then
+ _autoenv_debug "No env_file found when looking upwards"
return
fi
+ _autoenv_debug "Found env_file: $env_file"
fi
# Load the env file only once: check if $env_file is in the stack of entered
fi
if ! _autoenv_check_authorized_env_file $env_file; then
+ _autoenv_debug "Not authorized: $env_file"
return
fi
# Source the enter env file.
_autoenv_debug "Sourcing from chpwd handler: $env_file"
_autoenv_source $env_file enter
-
- : $(( _autoenv_debug_indent++ ))
}
# }}}