diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-03-21 17:31:18 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-03-24 14:29:18 -0700 |
| commit | cc5fae720a4dbc02891ce55c87754d499d66ddfc (patch) | |
| tree | e043a59c5d90d471c370c702c0c033ff974a7d72 /src | |
| parent | 8694c287628a2bcb1af2ba30bf778bfdd9ad0091 (diff) | |
| download | rust-cc5fae720a4dbc02891ce55c87754d499d66ddfc.tar.gz rust-cc5fae720a4dbc02891ce55c87754d499d66ddfc.zip | |
install: Error on uninstall if manifest can't be found
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/install.sh | 7 |
1 files changed, 7 insertions, 0 deletions
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 |