Fix './install.sh -B gcc' behavior: lists branches

Author: Damian Rouson

prerequisites/build-functions/download_if_necessary.sh

@@ -25,11 +25,11 @@ download_if_necessary()
       args=("clone")
       ;;
     "svn" )
-       case "${arg_B:-}" in 
-         "gcc") 
+       case "${arg_B:-}" in
+         "gcc")
            args=("ls")
-           ;; 
-         *) 
+           ;;
+         *)
            args=("checkout")
          ;;
        esac
@@ -39,18 +39,18 @@ download_if_necessary()
       case "${first_three_characters}" in
         "ftp"  )
            args=("-LO" "-u" "anonymous: ")
-        ;; 
+        ;;
         "htt"  )
            args=("-LO")
-        ;; 
+        ;;
         *)
           emergency "download_if_necessary.sh: Unrecognized URL."
         ;;
       esac
       ;;
     *)
       emergency "download_if_necessary.sh: Unrecognized \${fetch}=${fetch}."
-      ;; 
+      ;;
   esac
 
   case "${gcc_prereqs_fetch}" in
@@ -62,13 +62,14 @@ download_if_necessary()
       ;;
     "curl" )
       gcc_prereqs_fetch_args=("-LO" "-u" "anonymous: ")
-      ;; 
+      ;;
     *)
       emergency "download_if_necessary.sh: Unrecognized \${gcc_prereqs_fetch}=${gcc_prereqs_fetch}."
       ;;
    esac
-  
-  if  [[ -f "${download_path}/${url_tail}" || -d "${download_path}/${url_tail##*branches/}" ]]; then
+
+
+  if  [[ -f "${download_path}/${url_tail}" || -d "${download_path}/${url_tail##*branches/}" && ! -z ${url_tail##*branches/} ]]; then
     info "Found '${url_tail##*branches/}' in ${download_path}."
     info "If it resulted from an incomplete download, building ${package_name} could fail."
     if [[ "${arg_y}" == "${__flag_present}" ]]; then

prerequisites/build-functions/set_or_print_default_version.sh

@@ -13,7 +13,7 @@ set_or_print_default_version()
     echo "This script can build the following packages:"
   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
+  package_name="${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V:-${arg_B}}}}}}" # not needed for -l
 
   if [[ "${package_name}" == "ofp" ]]; then
     "${OPENCOARRAYS_SRC_DIR}/prerequisites/install-ofp.sh" "${@}"

prerequisites/build-functions/set_or_print_url.sh

@@ -53,10 +53,10 @@ else
   # Set differing tails for GCC release downloads versus development branch checkouts
   if [[ "${package_to_build}" == 'gcc' ]]; then
     if [[ "${fetch}" == 'svn' ]]; then
-      if [[ "${version_to_build}" == "trunk" ]]; then
+      if [[ "${version_to_build:-}" == "trunk" ]]; then
         gcc_tail="${version_to_build}"
       else
-        gcc_tail="branches/${version_to_build}"
+        gcc_tail="branches/${version_to_build:-}"
       fi
     else
       gcc_tail="gcc-${version_to_build}.tar.gz"