Skip to content

Commit

Permalink
rustup: probe for the existance of tar
Browse files Browse the repository at this point in the history
  • Loading branch information
erickt committed Dec 3, 2014
1 parent 3b4ad72 commit 98f01f1
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/etc/rustup.sh
Expand Up @@ -230,6 +230,7 @@ validate_opt() {
}

probe_need CFG_CURL curl
probe_need CFG_TAR tar

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


(cd "${TMP_DIR}" && tar xzf "${TARBALL_NAME}")
(cd "${TMP_DIR}" && ${CFG_TAR} xzf "${TARBALL_NAME}")
if [ $? -ne 0 ]
then
rm -Rf "${TMP_DIR}"
Expand All @@ -457,7 +458,7 @@ then
fi

if [ -z "${CFG_DISABLE_CARGO}" ]; then
(cd "${TMP_DIR}" && tar xzf "${CARGO_TARBALL_NAME}")
(cd "${TMP_DIR}" && ${CFG_TAR} xzf "${CARGO_TARBALL_NAME}")
if [ $? -ne 0 ]
then
rm -Rf "${TMP_DIR}"
Expand Down

0 comments on commit 98f01f1

Please sign in to comment.