---

yaml
---
r: 161471
b: refs/heads/snap-stage3
c: 4f65d97
h: refs/heads/master
i:
  161469: 1d27e00
  161467: c120266
  161463: 2ff37d3
  161455: f0ab779
  161439: e0a8870
  161407: b63affd
v: v3

Author: erickt

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4eb72d268f337a8f117c86a2ac1b98336cab9e9d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: fcb31e834716be12b98390eab921d5b7d39098de
+refs/heads/snap-stage3: 4f65d97bf8b4ec68ecba87ce75df1d6a6096a4e7
 refs/heads/try: 0f0d21c1eb5c7be04d323e0b06faf252ad790af6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/etc/rustup.sh

@@ -389,6 +389,17 @@ esac
 
 msg "host triple: ${HOST_TRIPLE}"
 
+CFG_INSTALL_FLAGS=""
+if [ -n "${CFG_UNINSTALL}" ]
+then
+    CFG_INSTALL_FLAGS="${CFG_INSTALL_FLAGS} --uninstall"
+fi
+
+if [ -n "${CFG_PREFIX}" ]
+then
+    CFG_INSTALL_FLAGS="${CFG_INSTALL_FLAGS} --prefix=${CFG_PREFIX}"
+fi
+
 CFG_TMP_DIR="./rustup-tmp-install"
 
 RUST_PACKAGE_NAME=rust-nightly
@@ -439,19 +450,7 @@ then
         err "failed to unpack installer"
 fi
 
-MAYBE_UNINSTALL=
-if [ -n "${CFG_UNINSTALL}" ]
-then
-        MAYBE_UNINSTALL="--uninstall"
-fi
-
-MAYBE_PREFIX=
-if [ -n "${CFG_PREFIX}" ]
-then
-        MAYBE_PREFIX="--prefix=${CFG_PREFIX}"
-fi
-
-sh "${RUST_LOCAL_INSTALL_SCRIPT}" "${MAYBE_UNINSTALL}" "${MAYBE_PREFIX}"
+sh "${RUST_LOCAL_INSTALL_SCRIPT}" "${CFG_INSTALL_FLAGS}"
 if [ $? -ne 0 ]
 then
         rm -Rf "${CFG_TMP_DIR}"
@@ -466,7 +465,7 @@ if [ -z "${CFG_DISABLE_CARGO}" ]; then
             err "failed to unpack cargo installer"
     fi
 
-    sh "${CARGO_LOCAL_INSTALL_SCRIPT}" "${MAYBE_UNINSTALL}" "${MAYBE_PREFIX}"
+    sh "${CARGO_LOCAL_INSTALL_SCRIPT}" "${CFG_INSTALL_FLAGS}"
     if [ $? -ne 0 ]
     then
             rm -Rf "${CFG_TMP_DIR}"