Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/download.pl: fix whitespace in mirror urls and drop for

Browse Source 
Fix whitespace in mirror urls and replace for loop with join+map logic.

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 15:54:12 +02:00
parent d08c9da43c
commit 295e0ed7a9
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/download.pl
View File

@ -75,8 +75,7 @@ sub download_cmd {
my $have_curl = 0; my $have_curl = 0;
my $have_aria2c = 0; my $have_aria2c = 0;
my $filename = shift; my $filename = shift;
my @additional_mirrors = @_; my $additional_mirrors = join(" ", map "$_/$filename", @_);
my $mirrors_url = "'$url'";
my @chArray = ('a'..'z', 'A'..'Z', 0..9); my @chArray = ('a'..'z', 'A'..'Z', 0..9);
my $rfn = join '', map{ $chArray[int rand @chArray] } 0..9; my $rfn = join '', map{ $chArray[int rand @chArray] } 0..9;
@ -93,13 +92,9 @@ sub download_cmd {
close ARIA2C; close ARIA2C;
} }
for my $mirror (@additional_mirrors ) {
$mirrors_url = $mirrors_url ." '$mirror /$filename'";
}
if ($have_aria2c) { if ($have_aria2c) {
return join(" ", "touch /dev/shm/${rfn}_spp;", return join(" ", "touch /dev/shm/${rfn}_spp;",
qw(aria2c --stderr -c -x2 -s10 -j10 -k1M), $mirrors_url , qw(aria2c --stderr -c -x2 -s10 -j10 -k1M), $url, $additional_mirrors,
$check_certificate ? () : '--check-certificate=false', $check_certificate ? () : '--check-certificate=false',
"--server-stat-of=/dev/shm/${rfn}_spp", "--server-stat-of=/dev/shm/${rfn}_spp",
"--server-stat-if=/dev/shm/${rfn}_spp", "--server-stat-if=/dev/shm/${rfn}_spp",