]> git.lizzy.rs Git - rust.git/commitdiff
rustup: probe for the existance of tar
authorErick Tryzelaar <erick.tryzelaar@gmail.com>
Mon, 1 Dec 2014 03:51:52 +0000 (19:51 -0800)
committerErick Tryzelaar <erick.tryzelaar@gmail.com>
Wed, 3 Dec 2014 22:40:33 +0000 (14:40 -0800)
src/etc/rustup.sh

index f73a0248c8516e323b23c403880084cb1be286de..52489412071cab80d90fe788c2a0cc18c5c3cda3 100755 (executable)
@@ -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"
@@ -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}"
@@ -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}"