kevin/asdf
1
Fork 0
mirror of https://github.com/asdf-vm/asdf.git synced 2024-11-15 01:28:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: assign default values to all internal variables (#1518)

Browse Source
This commit is contained in:
Edwin Kofler 2023-03-26 17:24:16 -07:00 committed by GitHub
parent 747a55fe4a
commit 86477ee8de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/asdf
View File

@ -68,6 +68,19 @@ asdf_cmd() {
exit 1
fi
# Internal Variables
ASDF_DEFAULT_TOOL_VERSIONS_FILENAME=$(asdf_default_tool_versions_filename)
export ASDF_DEFAULT_TOOL_VERSIONS_FILENAME
ASDF_CONFIG_FILE=$(asdf_config_file)
export ASDF_CONFIG_FILE
ASDF_DATA_DIR=$(asdf_data_dir)
export ASDF_DATA_DIR
ASDF_DIR=$(asdf_dir)
export ASDF_DIR
local result=
result="$(find_asdf_cmd "$@")"
ASDF_CMD_FILE=${result% *}

2
lib/functions/versions.bash
View File

@ -17,7 +17,7 @@ version_command() {
local file_name
local file
file_name="$(version_file_name)"
file_name="$(asdf_default_tool_versions_filename)"
if [ "$cmd" = "global" ]; then
file="$HOME/$file_name"

47
lib/utils.bash
View File

@ -5,9 +5,6 @@ GREP_OPTIONS="--color=never"
# shellcheck disable=SC2034
GREP_COLORS=
ASDF_DIR=${ASDF_DIR:-''}
ASDF_DATA_DIR=${ASDF_DATA_DIR:-''}
asdf_version() {
local version git_rev
version="v$(cat "$(asdf_dir)/version.txt")"
@ -19,21 +16,12 @@ asdf_version() {
fi
}
asdf_dir() {
if [ -z "$ASDF_DIR" ]; then
local current_script_path=${BASH_SOURCE[0]}
export ASDF_DIR
ASDF_DIR=$(
cd "$(dirname "$(dirname "$current_script_path")")" || exit
printf '%s\n' "$PWD"
)
fi
printf "%s\n" "$ASDF_DIR"
asdf_default_tool_versions_filename() {
printf '%s\n' "${ASDF_DEFAULT_TOOL_VERSIONS_FILENAME:-.tool-versions}"
}
asdf_repository_url() {
printf "https://github.com/asdf-vm/asdf-plugins.git\n"
asdf_config_file() {
printf '%s\n' "${ASDF_CONFIG_FILE:-$HOME/.asdfrc}"
}
asdf_data_dir() {
@ -50,6 +38,22 @@ asdf_data_dir() {
printf "%s\n" "$data_dir"
}
asdf_dir() {
if [ -z "$ASDF_DIR" ]; then
local current_script_path=${BASH_SOURCE[0]}
printf '%s\n' "$(
cd -- "$(dirname "$(dirname "$current_script_path")")" || exit
printf '%s\n' "$PWD"
)"
else
printf '%s\n' "$ASDF_DIR"
fi
}
asdf_repository_url() {
printf "https://github.com/asdf-vm/asdf-plugins.git\n"
}
get_install_path() {
local plugin=$1
local install_type=$2
@ -159,7 +163,7 @@ get_version_in_dir() {
local asdf_version
file_name=$(version_file_name)
file_name=$(asdf_default_tool_versions_filename)
asdf_version=$(parse_asdf_version_file "$search_path/$file_name" "$plugin_name")
if [ -n "$asdf_version" ]; then
@ -178,10 +182,6 @@ get_version_in_dir() {
done
}
version_file_name() {
printf "%s" "${ASDF_DEFAULT_TOOL_VERSIONS_FILENAME:-.tool-versions}"
}
find_versions() {
local plugin_name=$1
local search_path=$2
@ -385,7 +385,8 @@ get_asdf_config_value_from_file() {
get_asdf_config_value() {
local key=$1
local config_path=${ASDF_CONFIG_FILE:-"$HOME/.asdfrc"}
local config_path=
config_path=$(asdf_config_file)
local default_config_path=${ASDF_CONFIG_DEFAULT_FILE:-"$(asdf_dir)/defaults"}
local local_config_path
@ -454,7 +455,7 @@ get_plugin_source_url() {
}
find_tool_versions() {
find_file_upwards "$(version_file_name)"
find_file_upwards "$(asdf_default_tool_versions_filename)"
}
find_file_upwards() {