From cc5fae720a4dbc02891ce55c87754d499d66ddfc Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 21 Mar 2014 17:31:18 -0700 Subject: [PATCH] install: Error on uninstall if manifest can't be found --- src/etc/install.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/etc/install.sh b/src/etc/install.sh index 19e61251dc2..5b41e25e257 100644 --- a/src/etc/install.sh +++ b/src/etc/install.sh @@ -237,6 +237,7 @@ need_ok "failed to remove install probe" "${CFG_SRC_DIR}/bin/rustc" --version > /dev/null need_ok "can't run these binaries on this platform" + # First, uninstall from the installation prefix # FIXME: Hardcoded 'rustlib' ignores CFG_RUSTLIBDIR if [ -f "${CFG_PREFIX}/lib/rustlib/manifest" ] @@ -251,6 +252,12 @@ then msg "uninstall ${CFG_PREFIX}/lib/rustlib" rm -r "${CFG_PREFIX}/lib/rustlib" need_ok "failed to remove rustlib" +else + if [ -n "${CFG_UNINSTALL}" ] + then + err "unable to find manifest at ${CFG_PREFIX}/lib/rustlib" + exit 0 + fi fi # If we're only uninstalling then exit -- GitLab