fix: always use ASDF_DEFAULT_TOOL_VERSIONS_FILENAME for filename when present #1238
Conversation
| if [ "$cmd" = "global" ]; then | ||
| file=${ASDF_DEFAULT_TOOL_VERSIONS_FILENAME:-$HOME/.tool-versions} |
There was a problem hiding this comment.
Rather than having this "if custom file name use it, else use .tool-versions" logic spread around through the code, I have introduced a version_file_name helper function.
| @@ -174,6 +176,10 @@ get_version_in_dir() { | |||
| done | |||
| } | |||
|
|
|||
| version_file_name() { | |||
| printf "%s" "${ASDF_DEFAULT_TOOL_VERSIONS_FILENAME:-.tool-versions}" | |||
| } | |||
There was a problem hiding this comment.
This helper function encapsulates the version file logic and prints the correct version file name.
Note that this has nothing to do with legacy version files. This is only for asdf version files (default of .tool-versions of course).
| @@ -431,7 +437,7 @@ get_plugin_source_url() { | |||
| } | |||
|
|
|||
| find_tool_versions() { | |||
| find_file_upwards ".tool-versions" | |||
There was a problem hiding this comment.
We don't necessarily want to just find .tool-versions files, so we use the helper here.
| elif [ "$cmd" = "local-tree" ]; then | ||
| file=$(find_tool_versions) | ||
| else # cmd = local | ||
| file="$(pwd)/.tool-versions" | ||
| file="$(pwd)/$file_name" |
There was a problem hiding this comment.
All three of these commands should operate on ASDF_DEFAULT_TOOL_VERSIONS_FILENAME if it is set.
|
|
||
| if [ -n "$asdf_version" ]; then | ||
| printf "%s\\n" "$asdf_version|$search_path/.tool-versions" | ||
| printf "%s\\n" "$asdf_version|$search_path/$file_name" |
There was a problem hiding this comment.
This get_version_in_dir function should also read ASDF_DEFAULT_TOOL_VERSIONS_FILENAME if it is set.
Stratus3D
force-pushed
the
tb/default-tool-versions-filename-fix
branch
from
ed27d4d
to
1276e2f
Compare
| @test "global should write to ASDF_DEFAULT_TOOL_VERSIONS_FILENAME" { | ||
| export ASDF_DEFAULT_TOOL_VERSIONS_FILENAME="$PROJECT_DIR/global-tool-versions" | ||
| export ASDF_DEFAULT_TOOL_VERSIONS_FILENAME="global-tool-versions" |
There was a problem hiding this comment.
These tests were incorrectly setting ASDF_DEFAULT_TOOL_VERSIONS_FILENAME to a file path, but the docs state this must be a file name:
The filename of the file storing the tool names and versions. Defaults to .tool-versions. Can be any valid filename.
https://asdf-vm.com/manage/configuration.html#environment-variables
|
@vic just wanted to point out that I'm changing unit tests I believe you wrote for the version commands as they didn't use |
Fixes #1082
Tests are failing for some reason locally and I'm not sure why.