Merge pull request #181 from sourceryinstitute/use-curl-on-os-x

Use curl on OS X & append version # to install_path

Author: Damian Rouson

prerequisites/build-functions/download_if_necessary.sh

@@ -43,18 +43,21 @@ download_if_necessary()
       args="-n"
     elif [[ "${fetch}" == "git" ]]; then
       args="clone"
+    elif [[ "${fetch}" == "curl" ]]; then
+      args="-LO"
     fi
+
     if [[ "${fetch}" == "svn" || "${fetch}" == "git" ]]; then
       package_source_directory="${url_tail}"
     else
       package_source_directory="${package_name}-${version_to_build}"
     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}"
-    "${fetch}" "${args}" "${package_url}"
+    "${fetch}" ${args:-} ${package_url}
     popd
     if [[ "${version_to_build}" == '--avail' || "${version_to_build}" == '-a' ]]; then
       # In this case, args="ls" and the list of available versions has been printed so we can move on.

prerequisites/build-functions/set_or_print_default_version.sh

@@ -13,6 +13,14 @@ set_or_print_default_version()
   fi
   # Get package name from argument passed with -p, -V, -D, or -U
   package_name="${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}" # not needed for -l
+
+  if [[ "${package_name}" == "ofp" ]]; then
+    ${OPENCOARRAYS_SRC_DIR}/prerequisites/install-ofp.sh "${@}"
+    exit 0
+  fi 
+
+  [ "${package_name}" == "opencoarrays" ] && 
+    emergency "Please use this script with a previously downloaded opencoarrays source archive. This script does not download opencoarrays "
   # 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
@@ -26,7 +34,8 @@ set_or_print_default_version()
     "pkg-config:0.28"
     "make:4.1"
     "m4:1.4.17"
-    "subversion:1.9.2"
+    "subversion:1.9.4"
+    "ofp:sdf"
   )
   for package in "${package_version[@]}" ; do
      KEY="${package%%:*}"

prerequisites/build-functions/set_or_print_downloader.sh

@@ -9,25 +9,34 @@ set_or_print_downloader()
     emergency "Please pass only one of {-D, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
 
   package_name="${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}"
+  if [[ "${package_name}" == "ofp" ]]; then
+    ${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
+  else
+    wget_or_curl=wget
+  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"
-    "cmake:wget"
-    "mpich:wget"
-    "flex:wget"
+    "cmake:${wget_or_curl}"
+    "mpich:${wget_or_curl}"
+    "flex:${wget_or_curl}"
     "bison:ftp-url"
-    "pkg-config:wget"
+    "pkg-config:${wget_or_curl}"
     "make:ftp-url"
     "m4:ftp-url"
-    "subversion:wget"
+    "subversion:${wget_or_curl}"
   )
   for package in "${package_fetch[@]}" ; do
      KEY="${package%%:*}"

prerequisites/build-functions/set_or_print_installation_path.sh

@@ -7,18 +7,7 @@ set_or_print_installation_path()
   [ ! -z "${arg_P}" ] && [ ! -z "${arg_D:-${arg_p:-${arg_U:-${arg_V}}}}" ] &&
     emergency "Please pass only one of {-D, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
 
-  # ../build.sh-usage specifies the following installation path default for illustrative purposes only:
-  # Default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/${package_name:-}/"
-  # When the parse_command_line function executes, ${package_name:-} is empty, but it has
-  # been set before reaching the current function so now we can get the true values if the
-  # user didn't override the default:
-
-  path_in_usage_file="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations//"
-  if [[ "${arg_i}" == "${path_in_usage_file}" ]]; then
-    install_path="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/${package_name}/"
-  else
-    install_path="${arg_i}"
-  fi
+  install_path="${arg_i}/${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}/${version_to_build}"
 
   # If -P is present, print ${install_path} and exit with normal status
   if [[ ! -z "${arg_P:-}" ]]; then

prerequisites/build-functions/set_or_print_url.sh

@@ -53,7 +53,7 @@ set_or_print_url()
     "gcc;${gcc_tail:-}"
     "wget;wget-${version_to_build}.tar.gz"
     "m4;m4-${version_to_build}.tar.bz2"
-    "pkg-config;pkg-config-$version_to_build}.tar.gz"
+    "pkg-config;pkg-config-${version_to_build}.tar.gz"
     "mpich;mpich-${version_to_build}.tar.gz"
     "flex;flex-${version_to_build}.tar.bz2"
     "bison;bison-${version_to_build}.tar.gz"

prerequisites/build.sh

@@ -114,12 +114,12 @@ info "-V (--print-version):    ${arg_V} "
 }
 # shellcheck source=./build-functions/set_or_print_default_version.sh
 source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_default_version.sh"
-set_or_print_default_version
+set_or_print_default_version "${@}"
 export version_to_build="${arg_I:-${default_version}}"
 
 # shellcheck source=./build-functions/set_or_print_downloader.sh
 source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_downloader.sh"
-set_or_print_downloader
+set_or_print_downloader "${@}"
 
 # shellcheck source=./build-functions/set_or_print_url.sh
 source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_url.sh"

prerequisites/install-binary-functions/set_or_print_downloader.sh

@@ -11,11 +11,16 @@ set_or_print_downloader()
     fi
   fi
   package_name="${arg_D:-${arg_p:-${arg_P:-${arg_U:-${arg_V}}}}}"
+  if [[ $(uname) == "Darwin" ]]; then
+    wget_or_curl=curl
+  else
+    wget_or_curl=wget
+  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=(
-    "strategoxt-superbundle:wget"
+    "strategoxt-superbundle:${wget_or_curl}"
   )
   for package in "${package_fetch[@]}" ; do
      KEY="${package%%:*}"

prerequisites/install-binary.sh

@@ -30,18 +30,22 @@
 # (3) Parse the usage information (default usage file name: current file's name with -usage appended).
 # (4) Parse the command line using the usage information.
 
-export __usage="${OPENCOARRAYS_SRC_DIR}/prerequisites/install-binary.sh-usage"
 
 ### Start of boilerplate -- do not edit this block #######################
+export OPENCOARRAYS_SRC_DIR="${OPENCOARRAYS_SRC_DIR:-${PWD}/../}"
+if [[ ! -f "${OPENCOARRAYS_SRC_DIR}/src/libcaf.h" ]]; then
+  echo "Please run this script inside the top-level OpenCoarrays source \"prerequisites\" "
+  echo "subdirectory or set OPENCOARRAYS_SRC_DIR to the OpenCoarrays source directory path."
+  exit 1
+fi
+export __usage="${OPENCOARRAYS_SRC_DIR}/prerequisites/install-binary.sh-usage"
+export B3B_USE_CASE="${B3B_USE_CASE:-${OPENCOARRAYS_SRC_DIR}/prerequisites/use-case}"
 if [[ ! -f "${B3B_USE_CASE:-}/bootstrap.sh" ]]; then
   echo "Please set B3B_USE_CASE to the bash3boilerplate use-case directory path."
-  exit 1
-elif [[ ! -d "${OPENCOARRAYS_SRC_DIR:-}" ]]; then
-  echo "Please set OPENCOARRAYS_SRC_DIR to the OpenCoarrays source directory path."
   exit 2
 else
-  # shellcheck source=./use-case/bootstrap.sh
-  source "${B3B_USE_CASE}/bootstrap.sh" "$@"
+    # shellcheck source=./prerequisites/use-case/bootstrap.sh
+    source "${B3B_USE_CASE}/bootstrap.sh" "$@"
 fi
 ### End of boilerplate -- start user edits below #########################
 
@@ -131,7 +135,7 @@ set_or_print_csv_binary_names
 
 # shellcheck source=./build-functions/set_SUDO_if_needed_to_write_to_directory.sh
 source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh"
-set_SUDO_if_needed_to_write_to_directory /opt
+set_SUDO_if_needed_to_write_to_directory "${arg_i}"
 
 # shellcheck source=./install-binary-functions/move_binaries_to_install_path.sh
 source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/install-binary-functions/move_binaries_to_install_path.sh"

prerequisites/install-binary.sh-usage

@@ -2,7 +2,7 @@
   -D --print-downloader [arg] Print download program for package specified in argument. 
   -e --verbose                Enable verbose mode, print script as it is executed.
   -h --help                   This page.
-  -i --install-dir [arg]      Install package in specified path. Default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/${package_name:-}/${version_to_build:-}/"
+  -i --install-dir [arg]      Install package in specified path. Default="/opt"
   -I --install-version [arg]  Package version to install. (To see default, use -V or --print-version)
   -l --list-packages          List the packages this script can install.
   -n --no-color               Disable color output.

prerequisites/install-ofp.sh

@@ -31,12 +31,12 @@
 # (4) Parse the command line using the usage information.
 
 export OPENCOARRAYS_SRC_DIR="${OPENCOARRAYS_SRC_DIR:-${PWD}/..}"
-export __usage="${OPENCOARRAYS_SRC_DIR}/prerequisites/install-ofp.sh-usage"
 if [[ ! -f "${OPENCOARRAYS_SRC_DIR}/src/libcaf.h" ]]; then
   echo "Please run this script inside the OpenCoarrays source \"prerequisites\" subdirectory"
   echo "or set OPENCOARRAYS_SRC_DIR to the top-level OpenCoarrays source directory path."
   exit 1
 fi
+export __usage="${OPENCOARRAYS_SRC_DIR}/prerequisites/install-ofp.sh-usage"
 export B3B_USE_CASE="${B3B_USE_CASE:-${OPENCOARRAYS_SRC_DIR}/prerequisites/use-case}"
 if [[ ! -f "${B3B_USE_CASE:-}/bootstrap.sh" ]]; then
   echo "Please set B3B_USE_CASE to the bash3boilerplate use-case directory path."
@@ -64,7 +64,14 @@ if [[ "${__os}" != "OSX" ]]; then
    emergency "To request other platforms, please submit an issue at http://github.com/sourceryinstitute/opencoarrays/issues"
 fi
 
-default_ofp_downloader=wget
+if [[ $(uname) == "Darwin"  ]]; then
+  default_ofp_downloader=curl
+  args="-LO"
+else
+  default_ofp_downloader=wget
+  args="--no-check-certificate"
+fi
+
 # If -D is passed, print the download programs used for OFP and its prerequisites.
 # Then exit with normal status.
 # shellcheck  disable=SC2154
@@ -76,13 +83,12 @@ fi
 
 # If -P is passed, print the default installation paths for OFP and its prerequisites.
 # Then exit with normal status.
-default_ofp_install_path="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations"
-install_path="${arg_i:-"${default_ofp_install_path}"}"
-strategoxt_superbundle_install_path="/opt"
+install_path="${arg_i}"
+strategoxt_superbundle_install_path=`${OPENCOARRAYS_SRC_DIR}/prerequisites/install-binary.sh -P strategoxt-superbundle`
 # shellcheck disable=SC2154
 if [[ "${arg_P}" == "${__flag_present}" ]]; then
   echo "strategoxt-superbundle default installation path: ${strategoxt_superbundle_install_path}"
-  echo "ofp default installation path: ${default_ofp_install_path}"
+  echo "ofp default installation path: ${install_path}"
   exit 0
 fi
 
@@ -98,11 +104,12 @@ fi
 
 # If -U is passed, print the URLs for OFP and its prerequisites.
 # Then exit with normal status.
-ofp_URL="https://github.com/sourceryinstitute/opencoarrays/files/213108/ofp-sdf.tar.gz"
+ofp_url_head="https://github.com/sourceryinstitute/opencoarrays/files/213108/"
+ofp_url_tail="ofp-sdf.tar.gz"
 # shellcheck disable=SC2154
 if [[ "${arg_U}" == "${__flag_present}" ]]; then
   echo "strategoxt-superbundle URL: $("${OPENCOARRAYS_SRC_DIR}/prerequisites/install-binary.sh" -U strategoxt-superbundle)"
-  echo "ofp URL: ${ofp_URL}"
+  echo "ofp URL: ${ofp_url_head}${ofp_url_tail}"
   exit 0
 fi
 
@@ -147,11 +154,16 @@ if [[ ! -d "${install_path}" ]]; then
   set_SUDO_if_needed_to_write_to_directory "${install_path}"
   ${SUDO:-} mkdir -p "${install_path}"
 fi
+
 # Install OFP prerequisites to /opt (currently the only option)
 "${opencoarrays_prerequisites_dir}"/install-binary.sh -p strategoxt-superbundle -i "${strategoxt_superbundle_install_path}"
+
 # Downlaod OFP
 pushd "${install_path}"
-${default_ofp_downloader} "${ofp_URL}"
+info "OFP Download command: ${default_ofp_downloader} ${args:-} \"${ofp_url_head}${ofp_url_tail}\""
+${default_ofp_downloader} ${args:-} "${ofp_url_head}${ofp_url_tail}" 
+
+
 # Uncompress OFP
 tar xf ofp-sdf.tar.gz
 # Return to the original working directory