1
0
mirror of https://github.com/Tarrasch/zsh-autoenv.git synced 2025-12-14 10:15:12 +02:00

Change default values: .env => .autoenv.zsh etc

This changes the defaults:
 - AUTOENV_FILE_ENTER:   .env       => .autoenv.zsh
 - AUTOENV_FILE_LEAVE:   .env_leave => .autoenv_leave.zsh

`.env` is usually used only for key-value pairs for environment
settings, e.g. with foreman.  We do not want to interfere with this.

This also renames the setting/variable AUTOENV_ENV_FILENAME to
AUTOENV_AUTH_FILE, and uses the [XDG
spec](http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html#variables)
for the default location.

The new default location for the auth file will be
~/.local/share/autoenv_auth.

When the old setting is used, or the previous default exists, a warning
is given with instructions.

Fixes https://github.com/Tarrasch/zsh-autoenv/issues/31.
Closes https://github.com/Tarrasch/zsh-autoenv/pull/32.
This commit is contained in:
Daniel Hahler
2015-05-21 23:58:26 +02:00
parent 631ea30440
commit e68a914487
8 changed files with 117 additions and 93 deletions

View File

@@ -2,17 +2,17 @@
#
# It returns 1 in case of errors, and no tests should be run then!
#
# Ensure we have our mocked out AUTOENV_ENV_FILENAME
# Ensure we have our mocked out AUTOENV_AUTH_FILE
# (via .zshenv).
# Treat unset variables as errors.
# Not handled in varstash yet.
# setopt nounset
export AUTOENV_ENV_FILENAME="$CRAMTMP/.env_auth"
export AUTOENV_AUTH_FILE="$CRAMTMP/.autoenv_auth"
if [[ $AUTOENV_ENV_FILENAME[0,4] != '/tmp' ]]; then
echo "AUTOENV_ENV_FILENAME is not in /tmp. Aborting."
if [[ $AUTOENV_AUTH_FILE[0,4] != '/tmp' ]]; then
echo "AUTOENV_AUTH_FILE is not in /tmp. Aborting."
return 1
fi
@@ -24,11 +24,11 @@ set -e
$TEST_SOURCE_AUTOENV
# Reset any authentication.
echo -n >| $AUTOENV_ENV_FILENAME
echo -n >| $AUTOENV_AUTH_FILE
# Add file $1 (with optional hash $2) to authentication file.
test_autoenv_add_to_env() {
_autoenv_hash_pair $1 ${2:-} >>| $AUTOENV_ENV_FILENAME
_autoenv_hash_pair $1 ${2:-} >>| $AUTOENV_AUTH_FILE
}
# Add enter and leave env files to authentication file.