Re: [OpenWrt-Devel] [PATCH] Updated patch to check multiple instances in subfolders in local repository

[Tathagata Das]

Hi,
 I have updated the patch as Philip and Jo-Philipp suggested.

Signed-off-by: Tathagata Das <tathag...@alumnux.com>

---

diff -Naur a/scripts/download.pl b/scripts/download.pl
--- a/scripts/download.pl       2012-04-05 18:59:13.000000000 +0530
+++ b/scripts/download.pl       2012-04-06 11:27:12.000000000 +0530
@@ -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";
 
@@ -65,6 +66,7 @@
        $mirror =~ s/\/$//;
        if( $mirror =~ /^file:\/\// ) {
                my $cache = $mirror;
+               my $mylink="";
                $cache =~ s/file:\/\///g;
                if(system("test -d $cache")) {
                        print STDERR "Wrong local cache directory -$cache-.\n";
@@ -74,7 +76,32 @@
                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;
+                               $mylink=$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;
+                       }
+                       if ($i == 1){
+                               print("Copying $filename from $mylink\n");
+                               copy($mylink, "$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";


_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel