scripts/cli in rvm-0.1.45 vs scripts/cli in rvm-0.1.46

- old
+ new

@@ -298,13 +298,13 @@ rvm_ruby_args="$@" # list of binaries, or none rvm_parse_break=1 ;; -h|--help|usage) rvm_action=help ;; - -G) path_variable="rvm_gems_path" ; __rvm_set_path_variable ; shift ;; - --source) path_variable="rvm_src_path" ; __rvm_set_path_variable ; shift ;; - --archives) path_variable="rvm_archives_path" ; __rvm_set_path_variable ; shift ;; + -G) path_variable="rvm_gems_path" ; __rvm_set_path_variable "$1"; shift ;; + --source) path_variable="rvm_src_path" ; __rvm_set_path_variable "$1"; shift ;; + --archives) path_variable="rvm_archives_path" ; __rvm_set_path_variable "$1"; shift ;; --make) rvm_ruby_make="$1" ; shift ;; --make-install) rvm_ruby_make_install="$1" ; shift ;; --nice) rvm_niceness="$1" ; shift ;; -l|--level) rvm_ruby_patch_level="p$1" ; shift ;; # TODO: handle this below better (if $1 is null) @@ -463,11 +463,11 @@ __rvm_setup if [[ -n "$PS1" ]] ; then export rvm_interactive=1 ; else unset rvm_interactive ; fi if [[ -z "$ZSH_VERSION" ]] ; then - trap 'rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15 + trap '\rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15 fi # Check that this is the current version. disk_version=$(cat "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | \tr "\n" '.' | sed 's/\.$//') if [[ "${rvm_version}" != "${disk_version}" ]] && [[ "reload" != "$1" ]]; then @@ -481,10 +481,10 @@ __rvm_parse_args "$@" export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator result=0 - + case "$rvm_action" in use) __rvm_use ; result=$? ;; srcdir) __rvm_source_dir ; result=$? ;; strings) __rvm_strings ; result=$? ;; version) __rvm_version ; result=$? ;;