nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 07:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cargo to uninstall binaries by name correctly

Browse Source
This commit is contained in:
Zack Corr 2012-06-02 18:46:08 +10:00 committed by Brian Anderson
parent 3f983ca084
commit 84fce7a527
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cargo/cargo.rs
View File

@ -756,14 +756,18 @@ fn cmd_uninstall(c: cargo) {
ret;
}
let lib = c.libdir;
let bin = c.bindir;
let target = c.opts.free[2u];
// FIXME: needs stronger pattern matching
// FIXME: needs to uninstall from a specified location in a cache instead
// of looking for it (binaries can be uninstalled by name only)
if is_uuid(target) {
for os::list_dir(c.libdir).each { |file|
for os::list_dir(lib).each { |file|
alt str::find_str(file, "-" + target + "-") {
some(idx) {
let full = path::normalize(path::connect(c.libdir, file));
let full = path::normalize(path::connect(lib, file));
if os::remove_file(full) {
info("uninstalled: '" + full + "'");
} else {
@ -777,10 +781,25 @@ fn cmd_uninstall(c: cargo) {
error("can't find package with uuid: " + target);
} else {
for os::list_dir(c.libdir).each { |file|
for os::list_dir(lib).each { |file|
alt str::find_str(file, "lib" + target + "-") {
some(idx) {
let full = path::normalize(path::connect(c.libdir, file));
let full = path::normalize(path::connect(lib,
file));
if os::remove_file(full) {
info("uninstalled: '" + full + "'");
} else {
error("could not uninstall: '" + full + "'");
}
ret;
}
none { cont; }
}
}
for os::list_dir(bin).each { |file|
alt str::find_str(file, target) {
some(idx) {
let full = path::normalize(path::connect(bin, file));
if os::remove_file(full) {
info("uninstalled: '" + full + "'");
} else {