|
14 | 14 | CLEANUP_ON_EXIT=()
|
15 | 15 |
|
16 | 16 | function cleanup() {
|
17 |
| - for x in ${CLEANUP_ON_EXIT[@]}; do |
| 17 | + for x in "${CLEANUP_ON_EXIT[@]}"; do |
18 | 18 | rm -rf "${x}"
|
19 | 19 | done
|
20 | 20 | }
|
@@ -44,20 +44,26 @@ popd &>/dev/null # "${ROOT}/aws-lc-rs"
|
44 | 44 |
|
45 | 45 | RUSTLS_RCGEN_DIR="$(mktemp -d)"
|
46 | 46 | CLEANUP_ON_EXIT+=("${RUSTLS_RCGEN_DIR}")
|
47 |
| -cargo download rcgen | tar xvzf - -C "${RUSTLS_RCGEN_DIR}" --strip-components=1 |
| 47 | +cargo download -o "${RUSTLS_RCGEN_DIR}"/rcgen.tar.gz rcgen |
| 48 | +tar xvzf "${RUSTLS_RCGEN_DIR}"/rcgen.tar.gz -C "${RUSTLS_RCGEN_DIR}" --strip-components=1 |
| 49 | +rm "${RUSTLS_RCGEN_DIR}"/rcgen.tar.gz |
48 | 50 | RUSTLS_RCGEN_COMMIT="$(jq -r '.git.sha1' ${RUSTLS_RCGEN_DIR}/.cargo_vcs_info.json)"
|
49 | 51 | rm -rf "${RUSTLS_RCGEN_DIR}" # Cleanup before we clone
|
50 | 52 |
|
51 | 53 | RUSTLS_WEBPKI_DIR="$(mktemp -d)"
|
52 | 54 | CLEANUP_ON_EXIT+=("${RUSTLS_WEBPKI_DIR}")
|
53 |
| -cargo download rustls-webpki | tar xvzf - -C "${RUSTLS_WEBPKI_DIR}" --strip-components=1 |
| 55 | +cargo download -o "${RUSTLS_WEBPKI_DIR}"/rustls-webpki.tar.gz rustls-webpki |
| 56 | +tar xvzf "${RUSTLS_WEBPKI_DIR}"/rustls-webpki.tar.gz -C "${RUSTLS_WEBPKI_DIR}" --strip-components=1 |
| 57 | +rm "${RUSTLS_WEBPKI_DIR}"/rustls-webpki.tar.gz |
54 | 58 | RUSTLS_WEBPKI_COMMIT="$(jq -r '.git.sha1' ${RUSTLS_WEBPKI_DIR}/.cargo_vcs_info.json)"
|
55 | 59 | rm -rf "${RUSTLS_WEBPKI_DIR}" # Cleanup before we clone
|
56 | 60 |
|
57 | 61 | RUSTLS_DIR="$(mktemp -d)"
|
58 | 62 | CLEANUP_ON_EXIT+=("${RUSTLS_DIR}")
|
59 | 63 | if [[ $latest_release == "1" ]]; then
|
60 |
| - cargo download rustls | tar xvzf - -C "${RUSTLS_DIR}" --strip-components=1 |
| 64 | + cargo download -o "${RUSTLS_DIR}"/rustls.tar.gz rustls |
| 65 | + tar xvzf "${RUSTLS_DIR}"/rustls.tar.gz -C "${RUSTLS_DIR}" --strip-components=1 |
| 66 | + rm "${RUSTLS_DIR}"/rustls.tar.gz |
61 | 67 | RUSTLS_COMMIT="$(jq -r '.git.sha1' ${RUSTLS_DIR}/.cargo_vcs_info.json)"
|
62 | 68 | rm -rf "${RUSTLS_DIR}" # Cleanup before we clone
|
63 | 69 | fi
|
|
0 commit comments