Merge pull request #425 from sourceryinstitute/add-package-url

Add -u/--from-url option for install.sh

 Fixes #424

Author: zbeekman

install.sh

@@ -164,6 +164,7 @@ info  "-n (--no-color):         ${arg_n}"
 info  "-o (--only-download):    ${arg_o}"
 info  "-p (--package):          ${arg_p}"
 info  "-P (--print-path):       ${arg_P}"
+info  "-u (--from-url):         ${arg_u}"
 info  "-U (--print-url):        ${arg_U}"
 info  "-v (--version):          ${arg_v}"
 info  "-V (--print-version):    ${arg_V}"

install.sh-usage

@@ -17,6 +17,7 @@
   -o --only-download          Download (without building) the source for the package specified by -p or --package.
   -p --package [arg]          Install specified package. Default="opencoarrays"
   -P --print-path [arg]       Print installation directory for specified package.
+  -u --from-url [arg]         Specify a URL to use for downloading a package.
   -U --print-url [arg]        Print download location for specified package.
   -v --version                Print OpenCoarrays version number.
   -V --print-version [arg]    Print version number for specified package.

prerequisites/build-functions/set_or_print_url.sh

@@ -1,15 +1,22 @@
+# shellcheck shell=bash
 # If -p, -D, -P, or -V specifies a package, set package_url
 # If -U specifies a package, print the package_url and exit with normal status
 # shellcheck disable=SC2154
 set_or_print_url()
 {
   # Verify requirements
-  [ ! -z "${arg_U}" ] && [ ! -z "${arg_D:-${arg_p:-${arg_P:-${arg_V:-${arg_B}}}}}" ] &&
+  [[ -n "${arg_U}" && -n "${arg_D:-${arg_p:-${arg_P:-${arg_V:-${arg_B}}}}}" ]] &&
     emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
 
   # Get package name from argument passed with  -p, -D, -P, -V, or -U
   package_to_build="${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V:-${arg_B}}}}}}"
 
+if [[ -n "${arg_u:-}"  ]]; then
+  # User specified a URL from which to download the package
+  url_tail="${arg_u##*/}" # set url_tail to text_after_final_slash, greedy expansion needed
+  url_head="${arg_u%${url_tail}}" # set url_head text before url_tail
+else
+
   if [[ "${package_to_build}" == 'cmake' ]]; then
     major_minor="${version_to_build%.*}"
   elif [[ "${package_to_build}" == "gcc" ]]; then
@@ -35,7 +42,7 @@ set_or_print_url()
      KEY="${package%%;*}"
      VALUE="${package##*;}"
      info "KEY=${KEY}  VALUE=${VALUE}"
-     
+
      if [[ "${package_to_build}" == "${KEY}" ]]; then
        # We recognize the package name so we set the URL head:
        url_head="${VALUE}"
@@ -81,10 +88,12 @@ set_or_print_url()
     emergency "Package ${package_name:-} not recognized.  Use --l or --list-packages to list the allowable names."
   fi
 
+fi # end if [[ -n "${arg_u:-}"  ]]; then
+
   package_url="${url_head}""${url_tail}"
 
   # If a printout of the package URL was requested, then print it and exit with normal status
-  if [[ ! -z "${arg_U:-}" ]]; then
+  if [[ -n "${arg_U:-}" ]]; then
     printf "%s\n" "${package_url}"
     exit 0
   fi

prerequisites/build.sh

@@ -107,6 +107,7 @@ info "-n (--no-color):         ${arg_n} "
 info "-p (--package):          ${arg_p}"
 info "-P (--print-path):       ${arg_P} "
 info "-t (--with-tau):         ${arg_t} "
+info "-u (--from-url):         ${arg_u} "
 info "-U (--print-url):        ${arg_U} "
 info "-v (--version):          ${arg_v} "
 info "-V (--print-version):    ${arg_V} "

prerequisites/build.sh-usage

@@ -19,6 +19,7 @@
   -P --print-path [arg]       Print installation path for package specified in argument.
   -t --with-tau [arg]         Use the specified TAU parallel performance utilities installation. Default="tauf90"
   -T --install-tau [arg]      Install TAU in specified path. Default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/${package_name:-}/${version_to_build:-}/"
+  -u --from-url [arg]         Specify a URL from which to download a package. 
   -U --print-url [arg]        Print URL for package specified in argument. 
   -v --version                Print OpenCoarrays version number.
   -V --print-version [arg]    Print installation version for package specified in argument.