Skip to content

Commit e6d7e81

Browse files
committed
---
yaml --- r: 161742 b: refs/heads/master c: 98f01f1 h: refs/heads/master v: v3
1 parent f8da586 commit e6d7e81

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 3b4ad726f1d9982a91693e36bfce51b1013f16c4
2+
refs/heads/master: 98f01f1f5481f12796d2c7b57f36e998b1e644f0
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cafe2966770ff377aad6dd9fd808e68055587c58
55
refs/heads/try: 0f0d21c1eb5c7be04d323e0b06faf252ad790af6

trunk/src/etc/rustup.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ validate_opt() {
230230
}
231231

232232
probe_need CFG_CURL curl
233+
probe_need CFG_TAR tar
233234

234235
CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
235236
CFG_SELF="$0"
@@ -430,7 +431,7 @@ if [ -z "${CFG_DISABLE_CARGO}" ]; then
430431
fi
431432

432433

433-
(cd "${TMP_DIR}" && tar xzf "${TARBALL_NAME}")
434+
(cd "${TMP_DIR}" && ${CFG_TAR} xzf "${TARBALL_NAME}")
434435
if [ $? -ne 0 ]
435436
then
436437
rm -Rf "${TMP_DIR}"
@@ -457,7 +458,7 @@ then
457458
fi
458459

459460
if [ -z "${CFG_DISABLE_CARGO}" ]; then
460-
(cd "${TMP_DIR}" && tar xzf "${CARGO_TARBALL_NAME}")
461+
(cd "${TMP_DIR}" && ${CFG_TAR} xzf "${CARGO_TARBALL_NAME}")
461462
if [ $? -ne 0 ]
462463
then
463464
rm -Rf "${TMP_DIR}"

0 commit comments

Comments
 (0)