Patch GCC's contrib/download_prerequisites script

GCC's script is hardwired to use wget for downloading prerequisites.
This commit modifies GCC's script to use whichever download mechanism
the OpenCoarrays build system's prefers for the given platform: curl,
wget, or ftp.

Author: Damian Rouson

prerequisites/build-functions/build_and_install.sh

@@ -17,6 +17,13 @@ build_and_install()
   if [[ "${package_to_build}" == "gcc" ]]; then
     info "pushd ${download_path}/${package_source_directory} "
     pushd "${download_path}/${package_source_directory}"
+    arg_string="${args[@]:-}"
+    if [[ "$(uname)" == "Linux" ]]; then
+      sed -i'' "s/wget/${fetch} ${arg_string}/g" "${PWD}/contrib/download_prerequisites"
+    else
+      # This works on OS X and other POSIX-compliant operating systems:
+      sed -i '' "s/wget/${fetch} ${arg_string}/g" "${PWD}/contrib/download_prerequisites"
+    fi 
     "${PWD}"/contrib/download_prerequisites
     info "popd"
     popd

prerequisites/build-functions/download_if_necessary.sh

@@ -10,6 +10,32 @@ download_if_necessary()
 {
   download_path="${OPENCOARRAYS_SRC_DIR}/prerequisites/downloads"
   set_SUDO_if_needed_to_write_to_directory "${download_path}"
+
+  # We set args regardless of whether this function performs a download because
+  # GCC builds will need this to modify GCC's contrib/download_prerequisites script
+  if [[ "${fetch}" == "svn" ]]; then
+    if [[ "${arg_B:-}" == "gcc" ]]; then
+      args=("ls")
+    else
+      args=("checkout")
+    fi
+  elif [[ "${fetch}" == "wget" ]]; then
+    args=("--no-check-certificate")
+  elif [[ "${fetch}" == "ftp-url" ]]; then
+    args=("-n")
+  elif [[ "${fetch}" == "git" ]]; then
+    args=("clone")
+  elif [[ "${fetch}" == "curl" ]]; then
+    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  [[ -f "${download_path}/${url_tail}" || -d "${download_path}/${url_tail}" ]] ; then
     info "Found '${url_tail}' in ${download_path}."
     info "If it resulted from an incomplete download, building ${package_name} could fail."
@@ -35,29 +61,6 @@ download_if_necessary()
     info "Place the downloaded file in ${download_path} and restart this script."
     emergency "Aborting [exit 90]"
   else
-    # The download mechanism is in the path.
-    if [[ "${fetch}" == "svn" ]]; then
-      if [[ "${arg_B:-}" == "gcc" ]]; then
-        args="ls"
-      else
-        args="checkout"
-      fi
-    elif [[ "${fetch}" == "wget" ]]; then
-      args="--no-check-certificate"
-    elif [[ "${fetch}" == "ftp-url" ]]; then
-      args="-n"
-    elif [[ "${fetch}" == "git" ]]; then
-      args="clone"
-    elif [[ "${fetch}" == "curl" ]]; then
-      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
       package_source_directory="${url_tail}"
@@ -66,11 +69,10 @@ download_if_necessary()
     fi
     info "Downloading ${package_name} ${version_to_build-} to the following location:"
     info "${download_path}/${package_source_directory}"
-    info "Download command: \"${fetch}\" ${args:-} ${package_url}"
+    info "Download command: \"${fetch}\" ${args[@]:-} ${package_url}"
     info "Depending on the file size and network bandwidth, this could take several minutes or longer."
     pushd "${download_path}"
-    # args should be an array. Then "${args[@]:-}" will prevent shellcheck from complaining
-    "${fetch}" ${args:-} "${package_url}"
+    "${fetch}" ${args[@]:-} "${package_url}"
     popd
     if [[ ! -z "${arg_B:-}" ]]; then
       return

prerequisites/build-functions/ftp-url.sh

@@ -1,28 +1,34 @@
 # Download a file from an anonymous ftp site
 #
 # Usage:
-#    ftp-url  <ftp-mode>  <ftp-site-address>:/<path-to-file>/<file-name>
+#    ftp-url  <ftp-mode>  ftp://<fully-qualified-domain>:/<path-to-file>/<file-name>
 #
 # Example:
-#    ftp-url -n ftp.gnu.org:/gnu/m4/m4-1.4.17.tar.bz2
+#    ftp-url -n ftp://ftp.gnu.org:/gnu/gcc/gcc-6.1.0/gcc-6.1.0.tar.bz2
 ftp-url()
 {
   ftp_mode="${1}"
   url="${2}"
 
-  text_before_colon="${url%%:*}"
-  FTP_SERVER="${text_before_colon}"
+  if [[ "${ftp_mode}" != "-n" ]]; then
+    emergency "Unexpected ftp mode received by ftp-url.sh: ${ftp_mode}"
+  fi
 
-  text_after_colon="${url##*:}"
-  text_after_final_slash="${text_after_colon##*/}"
-  FILE_NAME="${text_after_final_slash}"
+  protocol="${url%%:*}" # grab text_before_first_colon
+  if [[ "${protocol}" != "ftp" ]]; then
+    emergency "URL with unexpected protocol received by ftp-url.sh: ${text_before_first_colon}"
+  fi
 
-  text_before_final_slash="${text_after_colon%/*}"
-  FILE_PATH="${text_before_final_slash}"
+  text_after_double_slash="${url##*//}"
+  FTP_SERVER="${text_after_double_slash%:*}" # grab remaining text before colon
+  
+  text_after_final_colon="${url##*:}"
+  FILE_NAME="${url##*/}" # grab text after final slash
+  FILE_PATH="${text_after_final_colon%/*}" # grab remaining text before final slash
 
   USERNAME=anonymous
   PASSWORD=""
-  info "starting anonymous download: ftp ${ftp_mode} ${FTP_SERVER}... cd ${FILE_PATH}... get ${FILE_NAME}"
+  info "starting anonymous download: ${protocol} ${ftp_mode} ${FTP_SERVER}... cd ${FILE_PATH}... get ${FILE_NAME}"
 
 ftp "${ftp_mode}" "${FTP_SERVER}" <<Done-ftp
 user "${USERNAME}" "${PASSWORD}"

prerequisites/build-functions/set_or_print_url.sh

@@ -14,20 +14,20 @@ set_or_print_url()
     major_minor="${version_to_build%.*}"
   elif [[ "${package_to_build}" == "gcc" ]]; then
     if [[ -z "${arg_b:-${arg_B}}" ]]; then
-      gcc_url_head="ftp.gnu.org:/gnu/gcc/gcc-${version_to_build}/"
+      gcc_url_head="ftp://ftp.gnu.org:/gnu/gcc/gcc-${version_to_build}/"
     else
       gcc_url_head="svn://gcc.gnu.org/svn/gcc/"
     fi
   fi
   package_url_head=(
     "gcc;${gcc_url_head-}"
-    "wget;ftp.gnu.org:/gnu/wget/"
-    "m4;ftp.gnu.org:/gnu/m4/"
+    "wget;ftp://ftp.gnu.org:/gnu/wget/"
+    "m4;ftp://ftp.gnu.org:/gnu/m4/"
     "pkg-config;http://pkgconfig.freedesktop.org/releases/"
     "mpich;http://www.mpich.org/static/downloads/${version_to_build-}/"
     "flex;http://sourceforge.net/projects/flex/files/"
     "make;ftp://ftp.gnu.org/gnu/make/"
-    "bison;ftp.gnu.org:/gnu/bison/"
+    "bison;ftp://ftp.gnu.org:/gnu/bison/"
     "cmake;http://www.cmake.org/files/v${major_minor-}/"
     "subversion;http://www.eu.apache.org/dist/subversion/"
   )

prerequisites/build.sh

@@ -149,7 +149,7 @@ if [[ -z "${arg_B}" ]]; then
   # shellcheck source=./build-functions/set_compilers.sh
   source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_compilers.sh"
   set_compilers
-
+ 
   # shellcheck source=./build-functions/build_and_install.sh
   source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/build_and_install.sh"
   build_and_install

prerequisites/install-functions/find_or_install.sh

@@ -578,9 +578,13 @@ find_or_install()
     default_package_version=$(./build.sh -V "${package}")
     package_install_prefix="${package_install_path%${package}/${arg_I:-${default_package_version}}*}"
 
+    if [[ "${arg_y}" == "${__flag_present}" ]]; then
+      yes_to_all="-y"
+    fi
+
     echo -e "$this_script: Downloading, building, and installing $package \n"
-    echo "$this_script: Build command: FC=$FC CC=$CC CXX=$CXX ./build.sh -p $package -i $package_install_prefix -j $num_threads"
-    FC="$FC" CC="$CC" CXX="$CXX" ./build.sh -p "$package" -i "$package_install_prefix" -j "$num_threads"
+    echo "$this_script: Build command: FC=$FC CC=$CC CXX=$CXX ./build.sh -p $package -i $package_install_prefix -j $num_threads ${yes_to_all:-}"
+    FC="$FC" CC="$CC" CXX="$CXX" ./build.sh -p "$package" -i "$package_install_prefix" -j "$num_threads" "${yes_to_all:-}"
 
     if [[ -x "$package_install_path/bin/$executable" ]]; then
       echo -e "$this_script: Installation successful.\n"