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: print tool-versions file dir on shim error (#750)

Browse Source
This commit is contained in:
James Hegedus 2020-07-31 18:46:33 +10:00 committed by GitHub
parent 62d2d9cb8b
commit a5c815b6d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/utils.bash
View File

@ -706,7 +706,7 @@ with_shim_executable() {
local shim_exec="${2}"
if [ ! -f "$(asdf_data_dir)/shims/${shim_name}" ]; then
echo "unknown command: ${shim_name}. Perhaps you have to reshim?" >&2
printf "%s %s %s\\n" "unknown command:" "${shim_name}." "Perhaps you have to reshim?" >&2
return 1
fi
@ -746,6 +746,8 @@ with_shim_executable() {
(
local preset_plugin_versions
preset_plugin_versions=()
local closest_tool_version
closest_tool_version=$(find_tool_versions)
local shim_plugins
IFS=$'\n' read -rd '' -a shim_plugins <<<"$(shim_plugins "$shim_name")"
@ -761,19 +763,16 @@ with_shim_executable() {
done
if [ -n "${preset_plugin_versions[*]}" ]; then
echo "asdf: No preset version installed for command ${shim_name}"
echo "Please install the missing version by running one of the following:"
echo ""
printf "%s %s\\n" "No preset version installed for command" "$shim_name"
printf "%s\\n\\n" "Please install a version by running one of the following:"
for preset_plugin_version in "${preset_plugin_versions[@]}"; do
echo "asdf install ${preset_plugin_version}"
printf "%s %s\\n" "asdf install" "$preset_plugin_version"
done
echo ""
echo "or add one of the following in your .tool-versions file:"
printf "\\n%s %s\\n" "or add one of the following versions in your config file at" "$closest_tool_version"
else
echo "asdf: No version set for command ${shim_name}"
echo "you might want to add one of the following in your .tool-versions file:"
printf "%s %s\\n" "No version set for command" "$shim_name"
printf "%s %s\\n" "Consider adding one of the following versions in your config file at" "$closest_tool_version"
fi
echo ""
shim_plugin_versions "${shim_name}"
) >&2

8
test/shim_exec.bats
View File

@ -90,7 +90,7 @@ teardown() {
[ "$status" -eq 126 ]
echo "$output" | grep -q "No version set for command dummy" 2>/dev/null
echo "$output" | grep -q "you might want to add one of the following in your .tool-versions file" 2>/dev/null
echo "$output" | grep -q "Consider adding one of the following versions in your config file at $PROJECT_DIR/.tool-versions" 2>/dev/null
echo "$output" | grep -q "dummy 1.0" 2>/dev/null
echo "$output" | grep -q "dummy 2.0" 2>/dev/null
}
@ -108,7 +108,7 @@ teardown() {
[ "$status" -eq 126 ]
echo "$output" | grep -q "No version set for command dummy" 2>/dev/null
echo "$output" | grep -q "you might want to add one of the following in your .tool-versions file" 2>/dev/null
echo "$output" | grep -q "Consider adding one of the following versions in your config file at $PROJECT_DIR/.tool-versions" 2>/dev/null
echo "$output" | grep -q "dummy 1.0" 2>/dev/null
echo "$output" | grep -q "mummy 3.0" 2>/dev/null
}
@ -121,10 +121,10 @@ teardown() {
run $ASDF_DIR/shims/dummy world hello
[ "$status" -eq 126 ]
echo "$output" | grep -q "No preset version installed for command dummy" 2>/dev/null
echo "$output" | grep -q "Please install the missing version by running one of the following:" 2>/dev/null
echo "$output" | grep -q "Please install a version by running one of the following:" 2>/dev/null
echo "$output" | grep -q "asdf install dummy 2.0" 2>/dev/null
echo "$output" | grep -q "asdf install dummy 1.3" 2>/dev/null
echo "$output" | grep -q "or add one of the following in your .tool-versions file:" 2>/dev/null
echo "$output" | grep -q "or add one of the following versions in your config file at $PROJECT_DIR/.tool-versions" 2>/dev/null
echo "$output" | grep -q "dummy 1.0" 2>/dev/null
}