[cig-commits] [commit] master: Make fetch more robust by saving to known filename. (11494fc)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith_installer

On branch  : master
Link       : https://github.com/geodynamics/pylith_installer/compare/e33d59eca0ccbcb1d07125bf7e8567c111ceaaa1...11494fc75af727cb0de2371b4edfc47baac88c6e

>---------------------------------------------------------------

commit 11494fc75af727cb0de2371b4edfc47baac88c6e
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Tue Apr 8 13:39:03 2014 -0700

    Make fetch more robust by saving to known filename.


>---------------------------------------------------------------

11494fc75af727cb0de2371b4edfc47baac88c6e
 bin/fetch.sh | 2 +-
 configure.ac | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/fetch.sh b/bin/fetch.sh
index 9aa5a6a..0cd62a8 100755
--- a/bin/fetch.sh
+++ b/bin/fetch.sh
@@ -29,7 +29,7 @@ if [ ! -f $file ]; then
     exit -1
   else
     echo "Downloading $file from $url."
-    $fetch $url/$file
+    $fetch $file $url/$file
   fi
 else
     echo "Found local copy of $file."
diff --git a/configure.ac b/configure.ac
index 3f4d965..1aac178 100644
--- a/configure.ac
+++ b/configure.ac
@@ -340,14 +340,14 @@ if test "$with_fetch" = "wget" ; then
   if test -z "$WGET" ; then
     AC_MSG_FAILURE([cannot find 'wget' program.])
   else
-    downloader="$WGET -nd -r"
+    downloader="$WGET -nd -r -O"
   fi
 elif test "$with_fetch" = "curl" ; then
   AC_PATH_PROG(CURL, curl)
   if test -z "$CURL" ; then
     AC_MSG_FAILURE([cannot find 'curl' program.])
   else
-    downloader="$CURL -O"
+    downloader="$CURL -L -O -o"
   fi
 else
   AC_MSG_FAILURE([Error in configure logic for downloader.])