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: Only display the "can't keep downloads" warning when asked to keep downloads (#1756)

Browse Source
This commit is contained in:
Ben Blank 2024-08-15 07:08:49 -07:00 committed by GitHub
parent ccdd47df9b
commit 44f3efb63b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/functions/installs.bash
View File

@ -234,15 +234,16 @@ install_tool_version() {
local install_exit_code=$? local install_exit_code=$?
if [ $install_exit_code -eq 0 ] && [ $download_exit_code -eq 0 ]; then if [ $install_exit_code -eq 0 ] && [ $download_exit_code -eq 0 ]; then
# Remove download directory if --keep-download flag or always_keep_download config setting are not set # If the download directory should be kept, but isn't available, warn the user
always_keep_download=$(get_asdf_config_value "always_keep_download") always_keep_download=$(get_asdf_config_value "always_keep_download")
if [ ! "$keep_download" = "true" ] && [ ! "$always_keep_download" = "yes" ]; then if [ "$keep_download" = "true" ] || [ "$always_keep_download" = "yes" ]; then
if [ -d "$download_path" ]; then if [ ! -d "$download_path" ]; then
rm -r "$download_path"
else
printf '%s\n' "asdf: Warn: You have configured asdf to preserve downloaded files (with always_keep_download=yes or --keep-download). But" >&2 printf '%s\n' "asdf: Warn: You have configured asdf to preserve downloaded files (with always_keep_download=yes or --keep-download). But" >&2
printf '%s\n' "asdf: Warn: the current plugin ($plugin_name) does not support that. Downloaded files will not be preserved." >&2 printf '%s\n' "asdf: Warn: the current plugin ($plugin_name) does not support that. Downloaded files will not be preserved." >&2
fi fi
# Otherwise, remove the download directory if it exists
elif [ -d "$download_path" ]; then
rm -r "$download_path"
fi fi
reshim_command "$plugin_name" "$full_version" reshim_command "$plugin_name" "$full_version"

18
test/install_command.bats
View File

@ -7,6 +7,7 @@ setup() {
install_dummy_legacy_plugin install_dummy_legacy_plugin
install_dummy_plugin install_dummy_plugin
install_dummy_broken_plugin install_dummy_broken_plugin
install_dummy_plugin_no_download
PROJECT_DIR="$HOME/project" PROJECT_DIR="$HOME/project"
mkdir -p "$PROJECT_DIR" mkdir -p "$PROJECT_DIR"
@ -302,11 +303,24 @@ EOM
[ "$output" = "Download failed!" ] [ "$output" = "Download failed!" ]
} }
@test "install_command prints info message if plugin does not support preserving download data if configured" { @test "install_command prints info message if plugin does not support preserving download data if --keep-download flag is provided" {
install_dummy_plugin_no_download run asdf install dummy-no-download 1.0.0 --keep-download
[ "$status" -eq 0 ]
[[ "$output" == *'asdf: Warn:'*'not be preserved'* ]]
}
@test "install_command prints info message if plugin does not support preserving download data if always_keep_download setting is true" {
echo 'always_keep_download = yes' >"$HOME/.asdfrc"
run asdf install dummy-no-download 1.0.0 run asdf install dummy-no-download 1.0.0
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" == *'asdf: Warn:'*'not be preserved'* ]] [[ "$output" == *'asdf: Warn:'*'not be preserved'* ]]
} }
@test "install_command does not print info message if --keep-download flag is not provided and always_keep_download setting is false" {
run asdf install dummy-no-download 1.0.0
[ "$status" -eq 0 ]
[[ "$output" != *'asdf: Warn:'*'not be preserved'* ]]
}