---

yaml
---
r: 162779
b: refs/heads/try
c: fcb31e8
h: refs/heads/master
i:
  162777: 5f0c400
  162775: f3b2a0b
v: v3

Author: erickt

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 9146a919b616e39e528e4d7100d16eef52f1f852
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cafe2966770ff377aad6dd9fd808e68055587c58
-refs/heads/try: e688eb3b4fcf4c5a22c4e69a2216d8d48a4109aa
+refs/heads/try: fcb31e834716be12b98390eab921d5b7d39098de
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/etc/rustup.sh

@@ -389,35 +389,35 @@ esac
 
 msg "host triple: ${HOST_TRIPLE}"
 
-TMP_DIR="./rustup-tmp-install"
+CFG_TMP_DIR="./rustup-tmp-install"
 
 RUST_PACKAGE_NAME=rust-nightly
 RUST_PACKAGE_NAME_AND_TRIPLE="${RUST_PACKAGE_NAME}-${HOST_TRIPLE}"
 RUST_TARBALL_NAME="${RUST_PACKAGE_NAME_AND_TRIPLE}.tar.gz"
 RUST_REMOTE_TARBALL="https://static.rust-lang.org/dist/${RUST_TARBALL_NAME}"
-RUST_LOCAL_TARBALL="${TMP_DIR}/${RUST_TARBALL_NAME}"
-RUST_LOCAL_INSTALL_DIR="${TMP_DIR}/${RUST_PACKAGE_NAME_AND_TRIPLE}"
+RUST_LOCAL_TARBALL="${CFG_TMP_DIR}/${RUST_TARBALL_NAME}"
+RUST_LOCAL_INSTALL_DIR="${CFG_TMP_DIR}/${RUST_PACKAGE_NAME_AND_TRIPLE}"
 RUST_LOCAL_INSTALL_SCRIPT="${RUST_LOCAL_INSTALL_DIR}/install.sh"
 
 CARGO_PACKAGE_NAME=cargo-nightly
 CARGO_PACKAGE_NAME_AND_TRIPLE="${CARGO_PACKAGE_NAME}-${HOST_TRIPLE}"
 CARGO_TARBALL_NAME="${CARGO_PACKAGE_NAME_AND_TRIPLE}.tar.gz"
 CARGO_REMOTE_TARBALL="https://static.rust-lang.org/cargo-dist/${CARGO_TARBALL_NAME}"
-CARGO_LOCAL_TARBALL="${TMP_DIR}/${CARGO_TARBALL_NAME}"
-CARGO_LOCAL_INSTALL_DIR="${TMP_DIR}/${CARGO_PACKAGE_NAME_AND_TRIPLE}"
+CARGO_LOCAL_TARBALL="${CFG_TMP_DIR}/${CARGO_TARBALL_NAME}"
+CARGO_LOCAL_INSTALL_DIR="${CFG_TMP_DIR}/${CARGO_PACKAGE_NAME_AND_TRIPLE}"
 CARGO_LOCAL_INSTALL_SCRIPT="${CARGO_LOCAL_INSTALL_DIR}/install.sh"
 
-rm -Rf "${TMP_DIR}"
+rm -Rf "${CFG_TMP_DIR}"
 need_ok "failed to remove temporary installation directory"
 
-mkdir -p "${TMP_DIR}"
+mkdir -p "${CFG_TMP_DIR}"
 need_ok "failed to create create temporary installation directory"
 
 msg "downloading rust installer"
 "${CFG_CURL}" "${RUST_REMOTE_TARBALL}" > "${RUST_LOCAL_TARBALL}"
 if [ $? -ne 0 ]
 then
-        rm -Rf "${TMP_DIR}"
+        rm -Rf "${CFG_TMP_DIR}"
         err "failed to download installer"
 fi
 
@@ -426,16 +426,16 @@ if [ -z "${CFG_DISABLE_CARGO}" ]; then
     "${CFG_CURL}" "${CARGO_REMOTE_TARBALL}" > "${CARGO_LOCAL_TARBALL}"
     if [ $? -ne 0 ]
     then
-            rm -Rf "${TMP_DIR}"
+            rm -Rf "${CFG_TMP_DIR}"
             err "failed to download cargo installer"
     fi
 fi
 
 
-(cd "${TMP_DIR}" && ${CFG_TAR} xzf "${RUST_TARBALL_NAME}")
+(cd "${CFG_TMP_DIR}" && ${CFG_TAR} xzf "${RUST_TARBALL_NAME}")
 if [ $? -ne 0 ]
 then
-        rm -Rf "${TMP_DIR}"
+        rm -Rf "${CFG_TMP_DIR}"
         err "failed to unpack installer"
 fi
 
@@ -454,25 +454,25 @@ fi
 sh "${RUST_LOCAL_INSTALL_SCRIPT}" "${MAYBE_UNINSTALL}" "${MAYBE_PREFIX}"
 if [ $? -ne 0 ]
 then
-        rm -Rf "${TMP_DIR}"
+        rm -Rf "${CFG_TMP_DIR}"
         err "failed to install Rust"
 fi
 
 if [ -z "${CFG_DISABLE_CARGO}" ]; then
-    (cd "${TMP_DIR}" && ${CFG_TAR} xzf "${CARGO_TARBALL_NAME}")
+    (cd "${CFG_TMP_DIR}" && ${CFG_TAR} xzf "${CARGO_TARBALL_NAME}")
     if [ $? -ne 0 ]
     then
-            rm -Rf "${TMP_DIR}"
+            rm -Rf "${CFG_TMP_DIR}"
             err "failed to unpack cargo installer"
     fi
 
     sh "${CARGO_LOCAL_INSTALL_SCRIPT}" "${MAYBE_UNINSTALL}" "${MAYBE_PREFIX}"
     if [ $? -ne 0 ]
     then
-            rm -Rf "${TMP_DIR}"
+            rm -Rf "${CFG_TMP_DIR}"
             err "failed to install Cargo"
     fi
 fi
 
-rm -Rf "${TMP_DIR}"
+rm -Rf "${CFG_TMP_DIR}"
 need_ok "couldn't rm temporary installation directory"