Imported recent work on Maneage, minor conflicts fixed

A few minor conflicts occurred and were fixed.

1 files changed, 21 insertions, 1 deletions

diff --git a/reproduce/analysis/bash/download-multi-try b/reproduce/analysis/bash/download-multi-try
index dec2539..7a5f8f2 100755
--- a/reproduce/analysis/bash/download-multi-try
+++ b/reproduce/analysis/bash/download-multi-try
@@ -51,11 +51,13 @@ set -e
 
 
 
-# Input arguments and necessary sanity checks.
+# Input arguments and necessary sanity checks. Note that the 5th argument
+# (backup servers) isn't mandatory.
 inurl="$3"
 outname="$4"
 lockfile="$2"
 downloader="$1"
+backupservers="$5"
 if [ "x$downloader" = x ]; then
     echo "$0: downloader (first argument) not given."; exit 1;
 fi
@@ -73,6 +75,13 @@ fi
 
 
 
+# Separate the actual filename, to possibly use backup server.
+urlfile=$(echo "$inurl" | awk -F "/" '{print $NF}')
+
+
+
+
+
 # Try downloading multiple times before crashing.
 counter=0
 maxcounter=10
@@ -107,8 +116,19 @@ while [ ! -f "$outname" ]; do
     if [ x"$lockfile" = xnolock ]; then
         if ! $downloader $outname $inurl; then rm -f $outname; fi
     else
+        # Try downloading from the requested URL.
         flock "$lockfile" bash -c \
               "if ! $downloader $outname $inurl; then rm -f $outname; fi"
+
+        # If it failed, try the backup server(s).
+        if [ ! -f "$outname" ]; then
+            if [ x"$backupservers" != x ]; then
+                for bs in "$backupservers"; do
+                    flock "$lockfile" bash -c \
+                          "if ! $downloader $outname $bs/$urlfile; then rm -f $outname; fi"
+                done
+            fi
+        fi
     fi
 
 done