Tweak find-cmake to use download.sh for downloader-agnosticism.

Author: vector-of-bool

.evergreen/scripts/find-cmake-latest.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
 find_cmake_latest() {
-  # shellcheck source=.evergreen/scripts/env-var-utils.sh
-  . "$(dirname "${BASH_SOURCE[0]}")/env-var-utils.sh"
-  . "$(dirname "${BASH_SOURCE[0]}")/use-tools.sh" paths
+  . "$(dirname "${BASH_SOURCE[0]}")/use-tools.sh" paths || return
 
   declare script_dir
   script_dir="$(to_absolute "$(dirname "${BASH_SOURCE[0]}")")" || return

.evergreen/scripts/find-cmake-version.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Used to workaround curl certificate validation failures on certain distros.
-. "$(dirname "${BASH_SOURCE[0]}")/use-tools.sh" platform
+. "$(dirname "${BASH_SOURCE[0]}")/use-tools.sh" platform download
 
 # Create a temporary directory in the existing directory $1.
 make_tmpdir_in() {
@@ -168,19 +168,13 @@ find_cmake_version() {
   *) ;; # Build from source.
   esac
 
-  declare -a curl_args
-  curl_args=(
-    "--retry" "5"
-    "-sS"
-    "--max-time" "120"
-    "--fail"
-  )
+  declare -a download_args=(--out="cmake.${extension}")
 
   # TODO: remove once BUILD-16817 is resolved.
   # Workaround SSL certificate validation failures on certain distros.
   case "$OS_SHORTNAME-$ARCHNAME" in
     ubuntu14-*|ubuntu16-ppc|RedHat7-ppc)
-      curl_args+=("-k")
+      download_args+=(--no-tls-verify)
       ;;
   esac
 
@@ -196,13 +190,14 @@ find_cmake_version() {
   if [[ -n "${platform:-}" ]]; then
     cmake_download_binary() (
       declare -r cmake_url="https://cmake.org/files/v${major}.${minor}/cmake-${version}-${platform}.${extension}"
+      download_args+=(--uri="${cmake_url}")
 
       echo "Downloading cmake-${version}-${platform}..."
 
       cd "${tmp_cmake_dir}" || return
 
       # Allow download to fail and fallback to building from source.
-      if curl "${curl_args[@]}" "${cmake_url}" --output "cmake.${extension}"; then
+      if download-file "${download_args[@]}"; then
         "${decompressor}" "${decompressor_args[@]}" "cmake.${extension}" || return
 
         cmake_replace_version "${cache_dir}" "$(pwd)/${root_dir}" "${version}" || return

tools/download.sh

@@ -42,6 +42,7 @@ download-file() {
     done
     if ! is-set uri || ! is-set out; then
         fail "download-file requires --uri=<uri> and --out=<filepath> arguments"
+        return
     fi
     debug "Download [$uri] to [$out]"
 
@@ -60,7 +61,7 @@ download-file() {
         fi
         curl_argv+=(-- "$uri")
         debug "Execute curl command: [curl ${curl_argv[*]}]"
-        output=$(curl "${curl_argv[@]}") || fail "$output"
+        output=$(curl "${curl_argv[@]}") || fail "$output" || return
         debug "$output"
     elif have-command wget; then
         wget_argv=(
@@ -73,10 +74,10 @@ download-file() {
         fi
         wget_argv+=(-- "$uri")
         debug "Execute wget command: [wget ${wget_argv[*]}]"
-        output=$(wget "${wget_argv[@]}" 2>&1) || fail "wget failed: $output"
+        output=$(wget "${wget_argv[@]}" 2>&1) || fail "wget failed: $output" || return
         debug "$output"
     else
-        fail "This script requires wither curl or wget to be available"
+        fail "This script requires either curl or wget to be available" || return
     fi
     debug "Download [$uri] to [$out] - Done"
 }