Ok, try to make shfs work with 2.6.19, raw fixes, so might need better reading of...

[openwrt.git] / scripts / download.pl

diff --git a/scripts/download.pl b/scripts/download.pl
index 84c97cf..859e6c8 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -1,4 +1,11 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+

 use strict;
 use warnings;
 
 use strict;
 use warnings;
 


@@ -11,12 +18,29 @@ my $ok;
 
 @ARGV > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
 
 
 @ARGV > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
 

+sub which($) {
+       my $prog = shift;
+       my $res = `which $prog`;
+       $res or return undef;
+       $res =~ /^no / and return undef;
+       $res =~ /not found/ and return undef;
+       return $res;
+}
+
+my $md5cmd = which("md5sum");
+$md5cmd or $md5cmd = which("md5");
+$md5cmd or die 'no md5 checksum program found, please install md5 or md5sum';
+chomp $md5cmd;
+

 sub download
 {
        my $mirror = shift;
 sub download
 {
        my $mirror = shift;

+       my $options = $ENV{WGET_OPTIONS};
+       $options or $options = "";

        
        

-       open WGET, "wget -t1 --timeout=20 -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
-       open MD5SUM, "| md5sum > \"$target/$filename.md5sum\"" or die "Cannot launch md5sum.\n";
+       $mirror =~ s/\/$//;
+       open WGET, "wget -t1 --timeout=20 $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
+       open MD5SUM, "| $md5cmd > \"$target/$filename.md5sum\"" or die "Cannot launch md5sum.\n";

        open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n";
        my $buffer;
        while (read WGET, $buffer, 1048576) {
        open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n";
        my $buffer;
        while (read WGET, $buffer, 1048576) {


@@ -34,7 +58,7 @@ sub download
        }
        
        my $sum = `cat "$target/$filename.md5sum"`;
        }
        
        my $sum = `cat "$target/$filename.md5sum"`;

-       $sum =~ /^(\w+)\s+/ or die "Could not generate md5sum\n";
+       $sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n";

        $sum = $1;
        
        if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) {
        $sum = $1;
        
        if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) {


@@ -56,18 +80,10 @@ sub cleanup
 
 foreach my $mirror (@ARGV) {
        if ($mirror =~ /^\@SF\/(.+)$/) {
 
 foreach my $mirror (@ARGV) {
        if ($mirror =~ /^\@SF\/(.+)$/) {

-               my $sfpath = $1;
-               open SF, "wget -t1 -q -O- 'http://prdownloads.sourceforge.net/$sfpath/$filename' |";
-               while (<SF>) {
-                       /type="radio" name="use_default" value="(\w+)" onclick="form\.submit\(\)"\/>/ and do {
-                               push @mirrors, "http://$1.dl.sourceforge.net/sourceforge/$sfpath";
-                       };
-                       /<a href="\/.+\?use_mirror=(\w+)"><b>Download/ and do {
-                               push @mirrors, "http://$1.dl.sourceforge.net/sourceforge/$sfpath";
-                       };
+               # give sourceforge a few more tries, because it redirects to different mirrors
+               for (1 .. 5) {
+                       push @mirrors, "http://downloads.sourceforge.net/$1";

                }
                }

-               push @mirrors, "http://dl.sourceforge.net/sourceforge/$sfpath";
-               close SF;

        } elsif ($mirror =~ /^\@GNU\/(.+)$/) {
                my $gnupath = $1;
                push @mirrors, "ftp://ftp.gnu.org/gnu/$gnupath";
        } elsif ($mirror =~ /^\@GNU\/(.+)$/) {
                my $gnupath = $1;
                push @mirrors, "ftp://ftp.gnu.org/gnu/$gnupath";


@@ -83,9 +99,9 @@ foreach my $mirror (@ARGV) {
        }
 }
 
        }
 }
 

-#push @mirrors, 'http://mirror1.openwrt.org/';
-#push @mirrors, 'http://mirror2.openwrt.org/';
-push @mirrors, 'http://downloads.openwrt.org/sources/';
+#push @mirrors, 'http://mirror1.openwrt.org';
+push @mirrors, 'http://mirror2.openwrt.org/sources';
+push @mirrors, 'http://downloads.openwrt.org/sources';

 
 while (!$ok) {
        my $mirror = shift @mirrors;
 
 while (!$ok) {
        my $mirror = shift @mirrors;