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
# }}}
-# 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
}
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
# ${autoenv_env_file:h}.
fi
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