Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

More housecleaning.

  • Loading branch information...
commit 38f1a0a99ed07e556c8e9f5ba77c08205e62b6ba 1 parent 22c722c
Wayne E. Seguin authored
Showing with 10 additions and 5 deletions.
  1. +10 −5 scripts/selector
15 scripts/selector
View
@@ -777,7 +777,9 @@ __rvm_ruby_string()
rvm_ruby_version="${rvm_ruby_version:-}"
if [[ -z "${rvm_ruby_version:-}" ]] && (( ${rvm_head_flag:=0} == 0 ))
then
- rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}"
+ rvm_ruby_version="${rvm_ruby_version:-"$(
+ __rvm_db "${rvm_ruby_interpreter}_version"
+ )"}"
fi
if [[ -z "${rvm_ruby_version:-}" ]]
@@ -809,7 +811,9 @@ __rvm_ruby_string()
rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_user_tag}"
else
- patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
+ patch_level="$(
+ __rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level"
+ )"
if [[ -n "${patch_level:-""}" ]]
then
@@ -921,6 +925,7 @@ __rvm_gemset_select()
if [[ -z "${rvm_ruby_gem_home:-}" || -n "${gemset:-}" ]]
then
rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
+
elif [[ -n "${gemset:-}" && "${rvm_gemset_name:-}" != "${gemset:-}" ]]
then
rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
@@ -937,10 +942,10 @@ __rvm_gemset_select()
fi
# If the gemset does not exist, then notify the user as such and abort the action.
- if [[ -n "${rvm_gemset_name:-""}" && ! -d "$rvm_ruby_gem_home" ]]
+ if [[ -n "${rvm_gemset_name:-}" && ! -d "${rvm_ruby_gem_home}" ]]
then
- if [[ ${rvm_gemset_create_on_use_flag:-0} -ne 1 &&
- ${rvm_create_flag:-0} -ne 1 && ${rvm_delete_flag:-0} -ne 1 ]]
+ if (( ${rvm_gemset_create_on_use_flag:=0} == 0 &&
+ ${rvm_create_flag:=0} == 0 && ${rvm_delete_flag:=0} == 0 ))
then
rvm_error "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
unset rvm_gemset_name gemset_name
Please sign in to comment.
Something went wrong with that request. Please try again.