From 0c4bcae7a1c66cc3b3e33841acc2c70c132c65bd Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 10 Apr 2012 14:11:45 +0000 Subject: [PATCH] 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 SVN-Revision: 31240 --- scripts/download.pl | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) 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 [ ...]\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"; -- 2.30.2