Merge pull request #91 from aaparella/explicit-remove

Allow for explicit naming of overrides to remove
brson · Aug 19, 2015 · e5480cf · e5480cf
2 parents 93aa9fa ca5250f
commit e5480cf
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/multirust b/src/multirust
@@ -13,7 13,7 @@
 # show-default Show information about the current default
 # list-overrides List all overrides
 # list-toolchains List all installed toolchains
-# remove-override Remove the current override
 # remove-override Remove an override, for current directory unless specified
 # remove-toolchain Uninstall a toolchain
 # run Run a command in an environment configured for a toolchain
 # delete-data Delete all user metadata, including installed toolchains
@@ -175,9 175,10 @@
 
 # <help-remove-override>
 #
-# Removes the override for the current directory.
 # Removes the override for the current directory, or the named override
 # if one is provided.
 #
-# Usage: multirust remove-override
 # Usage: multirust remove-override [override]
 #
 # </help-remove-override>
 
@@ -467,7 468,13 @@ handle_command_line_args() {
  show-override) show_override;;
  list-overrides) list_overrides;;
  list-toolchains) list_toolchains;;
- remove-override) remove_override;;
  remove-override) 
  if [ -z "${2-}" ]; then 
  remove_override "$(pwd -P)"
  else 
  remove_override $2
  fi
  ;;
 
  remove-toolchain)
  if [ -z "${2-}" ]; then
@@ -1113,7 1120,7 @@ set_override() {
 }
 
 remove_override() {
- local _override_dir="$(pwd -P)"
  local _override_dir="$1"
  assert_nz "$_override_dir" "empty pwd?"
 
  # Escape forward-slashes
@@ -1133,7 1140,7 @@ remove_override() {
  fi
  fi
  if [ $_have_override = false ]; then
- say "no override for current directory '$_override_dir'"
  say "no override for directory '$_override_dir'"
  return
  fi