scripts/download.pl: fix mirrors regression for curl and wget

With the introduction of aria2c support, curl and wget no longer try to
download the file from mirrors. Fix this regression by emptying the
remaining mirrors list only when aria2c is used.

Fixes: d39123626931 ("download.pl: add aria2c support")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2022-09-25 21:43:43 +02:00 committed by AmadeusGhost
parent b0ea2f3b0a
commit 5ae6c9be69

View File

@ -95,6 +95,7 @@ sub download_cmd {
} }
if ($have_aria2c) { if ($have_aria2c) {
@mirrors=();
return join(" ", "touch /dev/shm/${rfn}_spp;", return join(" ", "touch /dev/shm/${rfn}_spp;",
qw(aria2c --stderr -c -x2 -s10 -j10 -k1M), $url, $additional_mirrors, qw(aria2c --stderr -c -x2 -s10 -j10 -k1M), $url, $additional_mirrors,
$check_certificate ? () : '--check-certificate=false', $check_certificate ? () : '--check-certificate=false',
@ -334,7 +335,6 @@ while (!-f "$target/$filename") {
if (!-f "$target/$filename" && $url_filename ne $filename) { if (!-f "$target/$filename" && $url_filename ne $filename) {
download($mirror, $filename, @mirrors); download($mirror, $filename, @mirrors);
} }
@mirrors=();
} }
$SIG{INT} = \&cleanup; $SIG{INT} = \&cleanup;