Merge pull request #184 from sourceryinstitute/switch-ftp-to-curl-on-os-x

Switch ftp to curl on OS X

Author: Damian Rouson

.travis.yml

@@ -151,7 +151,7 @@ script:
       ln -fs "$(which gcc-5)" "$HOME/bin/gcc"
       ln -fs "$(which g++-5)" "$HOME/bin/g++"
       export PATH="$PATH:$HOME/bin"
-      yes | ./install.sh --install-dir="$HOME/opt/opencoarrays" -j 4 > install.log &
+      yes | ./install.sh -i "$HOME/opt/opencoarrays" -j 4 -f "$HOME/bin/gfortran" -c "$HOME/bin/gcc" -C "$HOME/bin/g++" > install.log &
       install_sh_PID=$!
       echo "install.log will be displayed after success or failure"
       while ps -p $install_sh_PID > /dev/null; do

prerequisites/build-functions/download_if_necessary.sh

@@ -44,7 +44,14 @@ download_if_necessary()
     elif [[ "${fetch}" == "git" ]]; then
       args="clone"
     elif [[ "${fetch}" == "curl" ]]; then
-      args="-LO"
+      first_three_characters=$(echo "${package_url}" | cut -c1-3)
+      if [[ "${first_three_characters}" == "ftp"  ]]; then 
+        args="-LO -u anonymous:"
+      elif [[ "${first_three_characters}" == "htt"  ]]; then 
+        args="-LO"
+      else
+        emergency "download_if_necessary.sh: Unrecognized URL."
+      fi
     fi
 
     if [[ "${fetch}" == "svn" || "${fetch}" == "git" ]]; then

prerequisites/build-functions/set_or_print_downloader.sh

@@ -13,29 +13,31 @@ set_or_print_downloader()
     ${OPENCOARRAYS_SRC_DIR}/prerequisites/install-ofp.sh "${@}"
     exit 0
   fi
-  if [[ "${package_name}" == "gcc" && "${version_to_build}" != "trunk" ]]; then
-    gcc_fetch="ftp-url"
-  else
-    gcc_fetch="svn"
-  fi
   if [[ $(uname) == "Darwin" ]]; then
     wget_or_curl=curl
+    ftp_or_curl=curl
   else
     wget_or_curl=wget
+    ftp_or_curl=ftp-url
+  fi
+  if [[ "${package_name}" == "gcc" && "${version_to_build}" != "trunk" ]]; then
+    gcc_fetch="${ftp_or_curl}"
+  else
+    gcc_fetch="svn"
   fi
   # This is a bash 3 hack standing in for a bash 4 hash (bash 3 is the lowest common
   # denominator because, for licensing reasons, OS X only has bash 3 by default.)
   # See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
   package_fetch=(
-    "gcc:$gcc_fetch"
-    "wget:ftp-url"
+    "gcc:${gcc_fetch}"
+    "wget:${ftp_or_curl}"
     "cmake:${wget_or_curl}"
     "mpich:${wget_or_curl}"
     "flex:${wget_or_curl}"
-    "bison:ftp-url"
+    "bison:${ftp_or_curl}"
     "pkg-config:${wget_or_curl}"
-    "make:ftp-url"
-    "m4:ftp-url"
+    "make:${ftp_or_curl}"
+    "m4:${ftp_or_curl}"
     "subversion:${wget_or_curl}"
   )
   for package in "${package_fetch[@]}" ; do