Merge pull request #279 from augustobmoura/fix/data-dir-resolve

Change fallbacks to ASDF_DATA_DIR to not include ASDF_DIR
This commit is contained in:
Augusto Moura 2021-12-24 00:45:06 -03:00 committed by GitHub
commit b842e07571
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View File

@ -17,8 +17,11 @@ plugin_name() {
printf "%s\n" "$ASDF_NODEJS_PLUGIN_NAME"
}
export ASDF_NODEJS_CACHE_DIR="${ASDF_DATA_DIR:-${ASDF_DIR:-$HOME/.asdf}}/tmp/$ASDF_NODEJS_PLUGIN_NAME/cache"
export ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}"
asdf_data_dir() {
printf "%s\n" "${ASDF_DATA_DIR:-$HOME/.asdf}"
}
export ASDF_NODEJS_CACHE_DIR="$(asdf_data_dir)/tmp/$ASDF_NODEJS_PLUGIN_NAME/cache"
# Colors
colored() {

View File

@ -11,7 +11,7 @@ plugin_name=$(basename "$(dirname "$this_dir")")
this_dir=$(cd "$this_dir" && pwd -P) # Normalizes the directory
asdf_data_dir=$(cd "${ASDF_DATA_DIR:-${ASDF_HOME:-$HOME/.asdf}}" && pwd -P)
asdf_data_dir=$(cd "${ASDF_DATA_DIR:-$HOME/.asdf}" && pwd -P)
asdf_shims_dir="$asdf_data_dir/shims"
plugin_dir="$asdf_data_dir/plugins/$plugin_name"