projects / openwrt / staging / jow.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
scripts: download.pl: ensure to ignore any existing .curlrc
[openwrt/staging/jow.git] / scripts / download.pl
diff --git a/scripts/download.pl b/scripts/download.pl
index 79ad8bfea01886ce153107d767b87e6d6804ece4..60a970cba3984eeb107b2295eadc6638f793a00f 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -107,7 +107,7 @@ sub download_cmd {
        my $filename = shift;
 
        if ($download_tool eq "curl") {
-               return (qw(curl -f --connect-timeout 20 --retry 5 --location),
+               return (qw(curl -q -f --connect-timeout 20 --retry 5 --location),
                        $check_certificate ? () : '--insecure',
                        shellwords($ENV{CURL_OPTIONS} || ''),
                        $url);
@@ -129,6 +129,7 @@ sub download_cmd {
                        $check_certificate ? () : '--check-certificate=false',
                        "--server-stat-of=$ENV{'TMPDIR'}/aria2c/${rfn}_spp",
                        "--server-stat-if=$ENV{'TMPDIR'}/aria2c/${rfn}_spp",
+                       "--daemon=false --no-conf", shellwords($ENV{ARIA2C_OPTIONS} || ''),
                        "-d $ENV{'TMPDIR'}/aria2c -o $rfn;",
                        "cat $ENV{'TMPDIR'}/aria2c/$rfn;",
                        "rm $ENV{'TMPDIR'}/aria2c/$rfn $ENV{'TMPDIR'}/aria2c/${rfn}_spp");
@@ -254,42 +255,42 @@ foreach my $mirror (@ARGV) {
                push @mirrors, "https://mirrors.tuna.tsinghua.edu.cn/debian/$1";
                push @mirrors, "https://mirrors.ustc.edu.cn/debian/$1"
        } elsif ($mirror =~ /^\@APACHE\/(.+)$/) {
-               push @mirrors, "https://mirror.netcologne.de/apache.org/$1";
+               push @mirrors, "https://dlcdn.apache.org/$1";
                push @mirrors, "https://mirror.aarnet.edu.au/pub/apache/$1";
                push @mirrors, "https://mirror.csclub.uwaterloo.ca/apache/$1";
                push @mirrors, "https://archive.apache.org/dist/$1";
-               push @mirrors, "http://mirror.cogentco.com/pub/apache/$1";
-               push @mirrors, "http://mirror.navercorp.com/apache/$1";
-               push @mirrors, "http://ftp.jaist.ac.jp/pub/apache/$1";
-               push @mirrors, "ftp://apache.cs.utah.edu/apache.org/$1";
-               push @mirrors, "ftp://apache.mirrors.ovh.net/ftp.apache.org/dist/$1";
+               push @mirrors, "https://mirror.cogentco.com/pub/apache/$1";
+               push @mirrors, "https://mirror.navercorp.com/apache/$1";
+               push @mirrors, "https://ftp.jaist.ac.jp/pub/apache/$1";
+               push @mirrors, "https://apache.cs.utah.edu/apache.org/$1";
+               push @mirrors, "http://apache.mirrors.ovh.net/ftp.apache.org/dist/$1";
                push @mirrors, "https://mirrors.tuna.tsinghua.edu.cn/apache/$1";
                push @mirrors, "https://mirrors.ustc.edu.cn/apache/$1";
        } elsif ($mirror =~ /^\@GITHUB\/(.+)$/) {
+               my $dir = $1;
+               my $i = 0;
+               # replace the 2nd '/' with '@' for jsDelivr mirror
+               push @mirrors, "https://cdn.jsdelivr.net/gh/". $dir =~ s{\/}{++$i == 2 ? '@' : $&}ger;
                # give github a few more tries (different mirrors)
                for (1 .. 5) {
-                       push @mirrors, "https://raw.githubusercontent.com/$1";
+                       push @mirrors, "https://raw.githubusercontent.com/$dir";
                }
        } elsif ($mirror =~ /^\@GNU\/(.+)$/) {
                push @mirrors, "https://mirror.csclub.uwaterloo.ca/gnu/$1";
                push @mirrors, "https://mirror.netcologne.de/gnu/$1";
-               push @mirrors, "http://ftp.kddilabs.jp/GNU/gnu/$1";
-               push @mirrors, "http://www.nic.funet.fi/pub/gnu/gnu/$1";
-               push @mirrors, "http://mirror.internode.on.net/pub/gnu/$1";
-               push @mirrors, "http://mirror.navercorp.com/gnu/$1";
-               push @mirrors, "ftp://mirrors.rit.edu/gnu/$1";
-               push @mirrors, "ftp://download.xs4all.nl/pub/gnu/$1";
+               push @mirrors, "https://ftp.kddilabs.jp/GNU/gnu/$1";
+               push @mirrors, "https://www.nic.funet.fi/pub/gnu/gnu/$1";
+               push @mirrors, "https://mirror.navercorp.com/gnu/$1";
+               push @mirrors, "https://mirrors.rit.edu/gnu/$1";
                push @mirrors, "https://ftp.gnu.org/gnu/$1";
                push @mirrors, "https://mirrors.tuna.tsinghua.edu.cn/gnu/$1";
                push @mirrors, "https://mirrors.ustc.edu.cn/gnu/$1";
        } elsif ($mirror =~ /^\@SAVANNAH\/(.+)$/) {
                push @mirrors, "https://mirror.netcologne.de/savannah/$1";
                push @mirrors, "https://mirror.csclub.uwaterloo.ca/nongnu/$1";
-               push @mirrors, "http://ftp.acc.umu.se/mirror/gnu.org/savannah/$1";
-               push @mirrors, "http://nongnu.uib.no/$1";
-               push @mirrors, "http://ftp.igh.cnrs.fr/pub/nongnu/$1";
-               push @mirrors, "ftp://cdimage.debian.org/mirror/gnu.org/savannah/$1";
-               push @mirrors, "ftp://ftp.acc.umu.se/mirror/gnu.org/savannah/$1";
+               push @mirrors, "https://ftp.acc.umu.se/mirror/gnu.org/savannah/$1";
+               push @mirrors, "https://nongnu.uib.no/$1";
+               push @mirrors, "https://cdimage.debian.org/mirror/gnu.org/savannah/$1";
        } elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {
                my @extra = ( $1 );
                if ($filename =~ /linux-\d+\.\d+(?:\.\d+)?-rc/) {
@@ -299,25 +300,19 @@ foreach my $mirror (@ARGV) {
                }
                foreach my $dir (@extra) {
                        push @mirrors, "https://cdn.kernel.org/pub/$dir";
-                       push @mirrors, "https://download.xs4all.nl/ftp.kernel.org/pub/$dir";
                        push @mirrors, "https://mirrors.mit.edu/kernel/$dir";
                        push @mirrors, "http://ftp.nara.wide.ad.jp/pub/kernel.org/$dir";
                        push @mirrors, "http://www.ring.gr.jp/archives/linux/kernel.org/$dir";
-                       push @mirrors, "ftp://ftp.riken.jp/Linux/kernel.org/$dir";
-                       push @mirrors, "ftp://www.mirrorservice.org/sites/ftp.kernel.org/pub/$dir";
-                       push @mirrors, "https://mirrors.tuna.tsinghua.edu.cn/kernel/$dir";
+                       push @mirrors, "https://ftp.riken.jp/Linux/kernel.org/$dir";
+                       push @mirrors, "https://www.mirrorservice.org/sites/ftp.kernel.org/pub/$dir";
                        push @mirrors, "https://mirrors.ustc.edu.cn/kernel.org/$dir";
                }
        } elsif ($mirror =~ /^\@GNOME\/(.+)$/) {
                push @mirrors, "https://download.gnome.org/sources/$1";
                push @mirrors, "https://mirror.csclub.uwaterloo.ca/gnome/sources/$1";
-               push @mirrors, "http://ftp.acc.umu.se/pub/GNOME/sources/$1";
-               push @mirrors, "http://ftp.kaist.ac.kr/gnome/sources/$1";
-               push @mirrors, "http://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/$1";
-               push @mirrors, "http://mirror.internode.on.net/pub/gnome/sources/$1";
-               push @mirrors, "http://ftp.belnet.be/ftp.gnome.org/sources/$1";
-               push @mirrors, "ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/$1";
-               push @mirrors, "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/sources/$1";
+               push @mirrors, "https://ftp.acc.umu.se/pub/GNOME/sources/$1";
+               push @mirrors, "http://ftp.cse.buffalo.edu/pub/Gnome/sources/$1";
+               push @mirrors, "http://ftp.nara.wide.ad.jp/pub/X11/GNOME/sources/$1";
                push @mirrors, "https://mirrors.ustc.edu.cn/gnome/sources/$1";
        } else {
                push @mirrors, $mirror;
Staging tree of Jo-Philipp Wich