---

yaml
---
r: 162783
b: refs/heads/try
c: bd8dac8
h: refs/heads/master
i:
  162781: f6b614a
  162779: 0c1f384
  162775: f3b2a0b
  162767: e3abfef
  162751: e8ee127
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: 8ca8e6fa4d3a7dc1a40e958cfa4ca62096bfa509
+refs/heads/try: bd8dac8f758fc76ff3c4553e187eba627728cf71
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/etc/rustup.sh

@@ -455,27 +455,37 @@ install_package() {
     fi
 }
 
-rm -Rf "${CFG_TMP_DIR}"
-need_ok "failed to remove temporary installation directory"
+# It's possible that curl could be interrupted partway though downloading
+# `rustup.sh`, truncating the file. This could be especially bad if we were in
+# the middle of a line that would run "rm -rf ". To protect against this, we
+# wrap up the `rustup.sh` destructive functionality in this helper function,
+# which we call as the last thing we do. This means we will not do anything
+# unless we have the entire file downloaded.
+install_packages() {
+    rm -Rf "${CFG_TMP_DIR}"
+    need_ok "failed to remove temporary installation directory"
 
-mkdir -p "${CFG_TMP_DIR}"
-need_ok "failed to create create temporary installation directory"
-
-download_and_extract_package \
-    "${RUST_URL}" \
-    "${RUST_TARBALL_NAME}"
+    mkdir -p "${CFG_TMP_DIR}"
+    need_ok "failed to create create temporary installation directory"
 
-if [ -z "${CFG_DISABLE_CARGO}" ]; then
     download_and_extract_package \
-        "${CARGO_URL}" \
-        "${CARGO_TARBALL_NAME}"
-fi
+        "${RUST_URL}" \
+        "${RUST_TARBALL_NAME}"
 
-install_package "${RUST_LOCAL_INSTALL_SCRIPT}"
+    if [ -z "${CFG_DISABLE_CARGO}" ]; then
+        download_and_extract_package \
+            "${CARGO_URL}" \
+            "${CARGO_TARBALL_NAME}"
+    fi
 
-if [ -z "${CFG_DISABLE_CARGO}" ]; then
-    install_package "${CARGO_LOCAL_INSTALL_SCRIPT}"
-fi
+    install_package "${RUST_LOCAL_INSTALL_SCRIPT}"
+
+    if [ -z "${CFG_DISABLE_CARGO}" ]; then
+        install_package "${CARGO_LOCAL_INSTALL_SCRIPT}"
+    fi
+
+    rm -Rf "${CFG_TMP_DIR}"
+    need_ok "couldn't rm temporary installation directory"
+}
 
-rm -Rf "${CFG_TMP_DIR}"
-need_ok "couldn't rm temporary installation directory"
+install_packages