aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2012-04-10 14:11:45 +0000
committerJohn Crispin <john@openwrt.org>2012-04-10 14:11:45 +0000
commit0c4bcae7a1c66cc3b3e33841acc2c70c132c65bd (patch)
tree743846d5dc21bb86be56ce92de076e0f082c0ccc
parentac007ff48201607c10897a14ead7f3c2024eec85 (diff)
downloadupstream-0c4bcae7a1c66cc3b3e33841acc2c70c132c65bd.tar.gz
upstream-0c4bcae7a1c66cc3b3e33841acc2c70c132c65bd.tar.bz2
upstream-0c4bcae7a1c66cc3b3e33841acc2c70c132c65bd.zip
allow arbitary folder layout when using localmirrors
Make the download script follow symlinks and search subfolders when looking for a file in a local download mirror. Signed-off-by: Tathagata Das <tathagata@alumnux.com> SVN-Revision: 31240
-rwxr-xr-xscripts/download.pl25
1 files changed, 24 insertions, 1 deletions
diff --git a/scripts/download.pl b/scripts/download.pl
index 042b1cce7d..86a6bf4657 100755
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -9,6 +9,7 @@
use strict;
use warnings;
use File::Basename;
+use File::Copy;
@ARGV > 2 or die "Syntax: $0 <target dir> <filename> <md5sum> [<mirror> ...]\n";
@@ -74,7 +75,29 @@ sub download
if(! -d $target) {
system("mkdir -p $target/");
}
- system("cp -vf $cache/$filename $target/$filename.dl") == 0 or return;
+ if (open TMPDLS, "find $cache -follow -name $filename 2>/dev/null |"){
+ my $i = 0;
+ my $link = "";
+ while (defined($link = readline TMPDLS)) {
+ chomp $link;
+ $i++;
+ if ($i > 1) {
+ print("$i or more instances of $filename in $cache found . Only one instance allowed.\n");
+ return;
+ }
+ }
+ close TMPDLS;
+ if ($i < 1) {
+ print("No instances of $filename found in $cache.\n");
+ return;
+ } elsif ($i == 1){
+ print("Copying $filename from $link\n");
+ copy($link, "$target/$filename.dl");
+ }
+ } else {
+ print("Failed to search for $filename in $cache\n");
+ return;
+ }
system("$md5cmd $target/$filename.dl > \"$target/$filename.md5sum\" ") == 0 or return;
} else {
open WGET, "wget -t5 --timeout=20 --no-check-certificate $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";