Skip to content

Commit 98f01f1

Browse files
committed
rustup: probe for the existance of tar
1 parent 3b4ad72 commit 98f01f1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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)