Minor CLI cleanup.

rvm · Apr 5, 2010 · adc0c09 · adc0c09
1 parent 8c11024
commit adc0c09
Showing 1 changed file with 3 additions and 35 deletions.
diff --git a/scripts/cli b/scripts/cli
@@ -206,31 +206,7 @@ __rvm_parse_args() {
         rvm_action="${rvm_action:-use}"
       ;;
 
-      --head)
-        #if [[ -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string="head"; else export rvm_ruby_string="${rvm_ruby_string}-head" ; fi
-        #rvm_action="${rvm_action:-use}"
-        #rvm_ruby_revision="head"
-        export rvm_head_flag=1
-      ;;
-
-      #
-      # Legacy items, replaced with ruby strings.
-      #
-      #-t|--tag)
-      #  rvm_ruby_tag="$1";
-      #  rvm_action="${rvm_action:-use}"
-      #  shift
-      #;;
-      #--rev|--revision)
-      #  rvm_ruby_revision="$1";
-      #  rvm_action="${rvm_action:-use}"
-      #  shift
-      #;;
-      #-b|--branch)
-      #  rvm_ruby_branch="$1";
-      #  rvm_action="${rvm_action:-use}"
-      #  shift
-      #;;
+      --head) export rvm_head_flag=1 ;;
 
       --bin)
         if [[ "update" = "$rvm_action" ]] ; then
@@ -292,7 +268,6 @@ __rvm_parse_args() {
         export rvm_ruby_string="$rvm_token"
       ;;
 
-
       -h|--help|usage|help) rvm_action=help                     ;;
       -G|--gems)            rvm_gems_path="$1"         ; shift  ;;
       --source)             rvm_src_path="$1"          ; shift  ;;
@@ -310,21 +285,14 @@ __rvm_parse_args() {
       --proxy)              export rvm_proxy="$1"      ; shift  ;;
       --disable-llvm|--disable-jit) export rvm_llvm_flag=0      ;;
       --enable-llvm|--enable-jit)   export rvm_llvm_flag=1      ;;
+      reboot|damnit|wtf|argh|BOOM|boom|wth) $rvm_action="reboot" ;;
 
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky|--create|--rvmrc|--gems)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;
 
-      reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth)
-        $rvm_action="reboot"
-      ;;
-
-      --)
-        rvm_ruby_args="$*"
-        rvm_parse_break=1
-      ;;
-
+      --) rvm_ruby_args="$*" ; rvm_parse_break=1                ;;
       *)
         if [[ ! -z "$rvm_token" ]] ; then
           if [[ "gemset" = "$rvm_action" ]] ; then