From dd94cd15d608a684a31f6b382809e001aacbf9bd Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 26 Nov 2022 22:51:26 +0000 Subject: Only allow available downloaders to be chosen when not in installer. --- perl-install/any.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index d09bc323b..e49c9ddff 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1959,6 +1959,10 @@ sub ask_mirror_and_downloader { my $mirror_choice = $mirror_url eq '$MIRRORLIST' ? 'automatic' : 'specific'; + my $enable_aria2 = $::isInstall || $in->do_pkgs->is_installed('aria2', '/usr/bin/aria2c'); + my $enable_curl = $::isInstall || $in->do_pkgs->is_installed('curl', '/usr/bin/curl'); + my $enable_wget = $::isInstall || $in->do_pkgs->is_installed('wget', '/usr/bin/wget'); + $in->ask_from_( { }, @@ -1981,9 +1985,9 @@ sub ask_mirror_and_downloader { my ($choice) = @_; +{ 'default' => N("Default"), - 'aria2' => 'aria2', - 'curl' => 'curl', - 'wget' => 'wget', + if_($enable_aria2, 'aria2' => 'aria2'), + if_($enable_curl, 'curl' => 'curl'), + if_($enable_wget, 'wget' => 'wget'), }->{$choice}; }, }, -- cgit v1.2.1