Merge pull request #252 from sourceryinstitute/fix-trunk-install

Fixes #234

Author: zbeekman

prerequisites/build-functions/build_and_install.sh

@@ -17,12 +17,12 @@ 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[@]:-}"
+    arg_string="${gcc_prereqs_fetch_args[@]:-}"
     if [[ "$(uname)" == "Linux" ]]; then
-      sed -i'' "s/wget/${fetch} ${arg_string}/g" "${PWD}/contrib/download_prerequisites"
+      sed -i'' s/"wget --no-verbose -O \"\${directory}\/\${ar}\""/"${gcc_prereqs_fetch} ${arg_string}"/ "${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"
+      sed -i '' s/"wget --no-verbose -O \"\${directory}\/\${ar}\""/"${gcc_prereqs_fetch} ${arg_string}"/ "${PWD}/contrib/download_prerequisites"
     fi 
     "${PWD}"/contrib/download_prerequisites
     info "popd"

prerequisites/build-functions/download_if_necessary.sh

@@ -13,29 +13,61 @@ download_if_necessary()
 
   # 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
 
+  case "${fetch}" in
+    "wget" )
+      args=("--no-check-certificate")
+      ;;
+    "ftp-url" )
+      args=("-n")
+      ;;
+    "git" )
+      args=("clone")
+      ;;
+    "svn" )
+       case "${arg_B:-}" in 
+         "gcc") 
+           args=("ls")
+           ;; 
+         *) 
+           args=("checkout")
+         ;;
+       esac
+       ;;
+    "curl" )
+      first_three_characters=$(echo "${package_url}" | cut -c1-3)
+      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
+    "wget" )
+      gcc_prereqs_fetch_args=("--no-check-certificate")
+      ;;
+    "ftp-url" )
+      gcc_prereqs_fetch_args=("-n")
+      ;;
+    "curl" )
+      gcc_prereqs_fetch_args=("-LO" "-u" "anonymous:")
+      ;; 
+    *)
+      emergency "download_if_necessary.sh: Unrecognized \${gcc_prereqs_fetch_args}=${gcc_prereqs_fetch_args}."
+      ;;
+   esac
+  
   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."

prerequisites/build-functions/set_or_print_downloader.sh

@@ -21,27 +21,29 @@ set_or_print_downloader()
   info "Checking available download mechanisms: ftp, wget, and curl."
   info "\${package_name}=${package_name}  \${arg_b:-\${arg_B:-}}=${arg_b:-${arg_B:-}}"
 
-  if [[ "${package_name}" == "gcc" && ! -z "${arg_b:-${arg_B:-}}" ]]; then
-
-    if type svn &> /dev/null; then
-      fetch=svn
-    else
-      tried="svn"
-    fi
-
-  elif type curl &> /dev/null; then
-    fetch=curl
+  if type curl &> /dev/null; then
+    gcc_prereqs_fetch=curl
   elif type wget &> /dev/null; then
-    fetch=wget
+    gcc_prereqs_fetch=wget
   elif type ftp &> /dev/null; then
     if [[ "${package_name}" == "gcc"   || "${package_name}" == "wget" || "${package_name}" == "make" ||
           "${package_name}" == "bison" || "${package_name}" == "m4"   ]]; then
-      fetch=ftp-url
+      gcc_prereqs_fetch=wget
     fi
   else
     tried="curl, wget, and ftp"
   fi
 
+  if [[ "${package_name}" == "gcc" && ! -z "${arg_b:-${arg_B:-}}" ]]; then
+    if type svn &> /dev/null; then
+      fetch=svn
+    else
+      tried="svn"
+    fi
+  else
+    fetch=${gcc_prereqs_fetch}
+  fi
+
   if [[ -z "${fetch:-}" ]]; then
     if [[ -z "${arg_B:-}" ]]; then
       warning "No available download mechanism. Options tried: ${tried}"