---

yaml
---
r: 109530
b: refs/heads/snap-stage3
c: 2205c48
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 01d823b4de9ecf7bf37e0e6433615592ac9b5565
+refs/heads/snap-stage3: 2205c48ee4949521d1a1a416afdb7ad7777b4a65
 refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -234,16 +234,16 @@ validate_opt
 # Sanity check: can we run the binaries?
 if [ -z "${CFG_DISABLE_VERIFY}" ]
 then
-	# Don't do this if uninstalling. Failure here won't help in any way.
-	if [ -z "${CFG_UNINSTALL}" ]
-	then
-		msg "verifying platform can run binaries"
-		"${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
-		if [ $? -ne 0 ]
-		then
-			err "can't execute rustc binary on this platform"
-		fi
-	fi
+    # Don't do this if uninstalling. Failure here won't help in any way.
+    if [ -z "${CFG_UNINSTALL}" ]
+    then
+        msg "verifying platform can run binaries"
+        "${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
+        if [ $? -ne 0 ]
+        then
+            err "can't execute rustc binary on this platform"
+        fi
+    fi
 fi
 
 # Sanity check: can we can write to the destination?
@@ -255,7 +255,7 @@ if [ $? -ne 0 ]
 then
     err "can't write to destination. consider \`sudo\`."
 fi
-rm "${CFG_LIBDIR}/rust-install-probe"
+rm -f "${CFG_LIBDIR}/rust-install-probe"
 need_ok "failed to remove install probe"
 
 # Sanity check: don't install to the directory containing the installer.
@@ -281,7 +281,7 @@ then
         msg "removing $p"
         if [ -f "$p" ]
         then
-            rm "$p"
+            rm -f "$p"
             if [ $? -ne 0 ]
             then
                 warn "failed to remove $p"
@@ -291,12 +291,16 @@ then
         fi
     done < "${INSTALLED_MANIFEST}"
 
-	# TODO: Remove the manifest.
-	# If we fail to remove rustlib below, then the installed manifest will
-	# still be full; the installed manifest needs to be empty before install.
+    # If we fail to remove rustlib below, then the installed manifest will
+    # still be full; the installed manifest needs to be empty before install.
+    msg "removing ${CFG_LIBDIR}/rustlib/manifest"
+    rm -f "${CFG_LIBDIR}/rustlib/manifest"
+    # For the above reason, this is a hard error
+    need_ok "failed to remove installed manifest"
 
     # Remove 'rustlib' directory
-    rm -r "${CFG_LIBDIR}/rustlib"
+    msg "removing ${CFG_LIBDIR}/rustlib"
+    rm -Rf "${CFG_LIBDIR}/rustlib"
     if [ $? -ne 0 ]
     then
         warn "failed to remove rustlib"