From: think <think>
Date: Tue, 30 Jun 2015 18:30:05 +0000 (+0000)
Subject: Sourceforge test 0 (may not work).
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=437ce14f9423d8289b07beb3dbfa578627e7347c;p=librecmc%2Flibrecmc-fossil.git

Sourceforge test 0 (may not work).
---

diff --git a/trunk/include/download.mk b/trunk/include/download.mk
index c4c1c14c..c375207e 100644
--- a/trunk/include/download.mk
+++ b/trunk/include/download.mk
@@ -11,7 +11,7 @@ DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
 define dl_method
 $(strip \
   $(if $(2),$(2), \
-    $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \
+    $(if $(filter @SF/% @GNOME/% @GNU/% @KERNEL/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \
       $(if $(filter git://%,$(1)),git, \
         $(if $(filter svn://%,$(1)),svn, \
           $(if $(filter cvs://%,$(1)),cvs, \
diff --git a/trunk/scripts/download.pl b/trunk/scripts/download.pl
index 4697bb4b..54752484 100755
--- a/trunk/scripts/download.pl
+++ b/trunk/scripts/download.pl
@@ -146,7 +146,10 @@ sub cleanup
 @mirrors = localmirrors();
 
 foreach my $mirror (@ARGV) {
-	if ($mirror =~ /^\@GNU\/(.+)$/) {
+	if ($mirror =~ /^\@SF\/(.+)$/) {
+                # give sourceforge a few more tries, because it redirects to different mirrors
+                push @mirrors, "http://downloads.librecmc.org/sources/$1";
+	} elsif ($mirror =~ /^\@GNU\/(.+)$/) {
 		push @mirrors, "http://ftpmirror.gnu.org/$1";
 		push @mirrors, "http://ftp.gnu.org/pub/gnu/$1";
 		push @mirrors, "ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/$1";
@@ -176,7 +179,7 @@ foreach my $mirror (@ARGV) {
 	}
 }
 
-push @mirrors, 'http://downloads.librecmc.org/sources/v1.3';
+push @mirrors, 'http://downloads.librecmc.org/sources/v1.3.1';
 
 while (!$ok) {
 	my $mirror = shift @mirrors;