scripts/selector in rvm-1.0.6 vs scripts/selector in rvm-1.0.7
- old
+ new
@@ -42,11 +42,11 @@
rvm_ruby_package_file="$rvm_ruby_package_name"
rvm_ruby_url="$rvm_ruby_url/$rvm_ruby_package_name"
fi
rvm_ruby_patch_level=""
else
- "$rvm_scripts_path/log" "fail" "MacRuby can only be installed on a Darwin OS."
+ "$rvm_path/scripts/log" "fail" "MacRuby can only be installed on a Darwin OS."
fi
;;
rbx|rubinius)
rvm_archive_extension="tar.gz"
@@ -149,12 +149,12 @@
rvm_ruby_package_file="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
rvm_ruby_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
fi
fi
- if ! "$rvm_scripts_path/match" "$rvm_ruby_version" "^1\.8" ; then
- "$rvm_scripts_path/log" "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
+ if ! "$rvm_path/scripts/match" "$rvm_ruby_version" "^1\.8" ; then
+ "$rvm_path/scripts/log" "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
fi
;;
mput|shyouhei)
rvm_ruby_interpreter="mput"
@@ -166,11 +166,11 @@
rvm_ruby_configure="" ; rvm_ruby_make="" ; rvm_ruby_make_install=""
;;
ruby)
if [[ -z "${rvm_ruby_version:-""}" && ${rvm_head_flag:-0} -eq 0 ]]; then
- "$rvm_scripts_path/log" "fail" "Unknown ruby version: $rvm_ruby_version"
+ "$rvm_path/scripts/log" "fail" "Unknown ruby version: $rvm_ruby_version"
else
rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
if [[ ${rvm_head_flag:-0} -eq 0 ]]; then
@@ -180,11 +180,11 @@
;;
current)
ruby_binary="$(command -v ruby)"
- if [[ $? -eq 0 ]] && "$rvm_scripts_path/match" "$ruby_binary" "rvm" ; then
+ if [[ $? -eq 0 ]] && "$rvm_path/scripts/match" "$ruby_binary" "rvm" ; then
rvm_ruby_string="$(dirname "$ruby_binary" | xargs dirname | xargs basename)"
else
rvm_ruby_interpreter="system"
fi
@@ -199,11 +199,11 @@
rvm_ruby_string=$(basename $MY_RUBY_HOME)
__rvm_select
else
if [[ -z "${rvm_ruby_string:-""}" ]] ; then
- "$rvm_scripts_path/log" "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+ "$rvm_path/scripts/log" "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
return 1
fi
fi
esac
@@ -231,12 +231,12 @@
export MAGLEV_HOME="$rvm_ruby_home"
export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME
fi
if [[ ! -z "$rvm_gemset_name" ]] ; then
- rvm_ruby_gem_home="${rvm_ruby_gem_home}${rvm_gemset_separator}${rvm_gemset_name}"
- rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_gems_path}/${rvm_ruby_string}${rvm_gemset_separator}global"
+ rvm_ruby_gem_home="${rvm_ruby_gem_home}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
+ rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_gems_path}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}global"
fi
rvm_ruby_selected_flag=1
\mkdir -p "$rvm_ruby_log_path"
@@ -285,11 +285,13 @@
[[ -L "$full_binary_path" ]] && \rm -f "$full_binary_path"
done
fi
- [[ ${rvm_verbose_flag:-0} -gt 0 ]] && "$rvm_scripts_path/log" "info" "Now using system ruby."
+ if [[ ${rvm_verbose_flag:-0} -gt 0 ]] ; then
+ "$rvm_path/scripts/log" "info" "Now using system ruby."
+ fi
export rvm_ruby_string="system"
else
GEM_HOME="$rvm_ruby_gem_home"
@@ -302,24 +304,27 @@
export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
IRBRC=${IRBRC:-""} ; if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
if [[ ! -d "$MY_RUBY_HOME" ]] ; then
- "$rvm_scripts_path/log" "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
+ "$rvm_path/scripts/log" "warn" \
+ "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
+
if [[ ${rvm_install_on_use_flag:-0} -eq 1 ]] ; then
- "$rvm_scripts_path/manage" "install" "$rvm_ruby_string"
+ "$rvm_path/scripts/manage" "install" "$rvm_ruby_string"
else
- "$rvm_scripts_path/log" "info" "To install do: 'rvm install $rvm_ruby_string'"
+ "$rvm_path/scripts/log" "info" \
+ "To install do: 'rvm install $rvm_ruby_string'"
return 1
fi
fi
# Ensure the environment file for the selected ruby exists.
__rvm_ensure_has_environment_files
[[ ${rvm_verbose_flag:-0} -gt 0 ]] && \
- "$rvm_scripts_path/log" "info" \
+ "$rvm_path/scripts/log" "info" \
"Using ${GEM_HOME/${rvm_gemset_separator:-'@'}/ with gemset }"
new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:$rvm_bin_path:$(__rvm_remove_rvm_from_path ; printf "$PATH")"
fi
@@ -340,43 +345,43 @@
if [[ ${rvm_default_flag:-0} -eq 1 && "default" != "${rvm_ruby_interpreter:-""}" ]] ; then
if [[ "${rvm_selfcontained:-""}" = "0" ]] ; then
# Sets up the default wrappers.
- "$rvm_scripts_path/wrapper" "$rvm_ruby_string" --no-prefix
+ "$rvm_path/scripts/wrapper" "$rvm_ruby_string" --no-prefix
else
- "$rvm_scripts_path/wrapper" "$rvm_scripts_path" "default"
+ "$rvm_path/scripts/wrapper" "$rvm_path/scripts" "default"
fi
if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
- "$rvm_scripts_path/alias" delete default &> /dev/null
+ "$rvm_path/scripts/alias" delete default &> /dev/null
\find "$rvm_bin_path" -name 'default_*' -maxdepth 0 -delete
\rm -f "$rvm_config_path/default"
\rm -f "$rvm_environments_path/default"
\rm -rf "$rvm_wrappers_path/default"
else
RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')"
export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
- "$rvm_scripts_path/alias" delete default &> /dev/null
- "$rvm_scripts_path/alias" create default "$environment_id" >& /dev/null
+ "$rvm_path/scripts/alias" delete default &> /dev/null
+ "$rvm_path/scripts/alias" create default "$environment_id" >& /dev/null
\ln -nfs "$rvm_environments_path/$environment_id" "$rvm_environments_path/default"
\ln -nfs "$rvm_wrappers_path/$environment_id" "$rvm_wrappers_path/default"
fi
fi
rvm_default_flag=0
if [[ -n "${rvm_wrapper_name:-""}" ]] ; then
- "$rvm_scripts_path/wrapper" "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
+ "$rvm_path/scripts/wrapper" "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
rvm_wrapper_name=""
fi
if [[ -n "${rvm_ruby_alias:-""}" ]]; then
- "$rvm_scripts_path/log" "info" "Attempting to alias $environment_id to $rvm_ruby_alias"
- "$rvm_scripts_path/alias" delete "$rvm_ruby_alias" > /dev/null 2>&1
- rvm_alias_expanded=1 "$rvm_scripts_path/alias" create "$rvm_ruby_alias" "$environment_id" > /dev/null 2>&1
+ "$rvm_path/scripts/log" "info" "Attempting to alias $environment_id to $rvm_ruby_alias"
+ "$rvm_path/scripts/alias" delete "$rvm_ruby_alias" > /dev/null 2>&1
+ rvm_alias_expanded=1 "$rvm_path/scripts/alias" create "$rvm_ruby_alias" "$environment_id" > /dev/null 2>&1
ruby_alias="" ; rvm_ruby_alias=""
fi
if [[ "maglev" = "${rvm_ruby_interpreter:-""}" ]] ; then
export MAGLEV_HOME="$rvm_ruby_home"
@@ -385,11 +390,11 @@
"$MAGLEV_HOME/gemstone/bin/gslist" -clv > /dev/null 2>&1 ; result=$?
if [[ $result -eq 1 ]] ; then "$rvm_ruby_home/bin/maglev" start ; fi
fi
fi
- rvm_hook="after_use" ; source "$rvm_scripts_path/hook"
+ rvm_hook="after_use" ; source "$rvm_path/scripts/hook"
return 0
}
__rvm_ruby_string() {
@@ -409,117 +414,130 @@
rvm_ruby_version=${rvm_ruby_version:-""}
rvm_ruby_patch_level=${rvm_ruby_patch_level:-""}
rvm_ruby_revision=${rvm_ruby_revision:-""}
rvm_ruby_tag=${rvm_ruby_tag:-""}
- if echo "$rvm_ruby_string" | \grep -q "$rvm_gemset_separator" ; then
- rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator}/}"
- rvm_ruby_string="${rvm_ruby_string/${rvm_gemset_separator}*/}"
+ if echo "$rvm_ruby_string" | \grep -q "${rvm_gemset_separator:-"@"}" ; then
+ rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator:-"@"}/}"
+ rvm_ruby_string="${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}"
rvm_sticky_flag=1
fi
# Alias'd rubies
if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n ${rvm_ruby_string:-""} ]]; then
- if expanded_alias_name="$("$rvm_scripts_path/alias" show "$rvm_ruby_string" 2>/dev/null)" && [[ -n "$expanded_alias_name" ]] ; then
+ if expanded_alias_name="$("$rvm_path/scripts/alias" show "$rvm_ruby_string" 2>/dev/null)" && [[ -n "$expanded_alias_name" ]] ; then
rvm_ruby_string="$expanded_alias_name"
elif [[ "$rvm_ruby_string" = default ]]; then
# Default is not a known value. Instead, we need to therefore set it to system.
rvm_ruby_string="system"
fi
fi
- ruby_string=${rvm_ruby_string/${rvm_gemset_separator}*/}
+ ruby_string=${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}
__rvm_unset_ruby_variables
- strings=(${ruby_string//-/ })
+ strings=($(echo ${ruby_string//-/ }))
- for string in "${strings[@]}" ; do
+ if [[ ${#strings[@]} -eq 0 ]] ; then
+ if echo "${GEM_HOME:-""}" | grep -q "rvm" ; then
+ # Current Ruby
+ strings="${GEM_HOME##*\/}"
+ strings=("${strings/%${rvm_gemset_separator:-"@"}*}")
+ rvm_ruby_string=${strings[@]:(1)}
+ else
+ strings=(system)
+ rvm_ruby_string="system"
+ fi
+ fi
+
+ for string in "${strings[@]:-""}" ; do
+
# TODO: case...
case "$string" in
head)
- rvm_ruby_revision="head"
- rvm_ruby_patch_level="" ; rvm_ruby_revision="" ; rvm_ruby_tag=""
- export rvm_head_flag=1
- ;;
+ rvm_ruby_revision="head"
+ rvm_ruby_patch_level="" ; rvm_ruby_revision="" ; rvm_ruby_tag=""
+ export rvm_head_flag=1
+ ;;
- system)
- rvm_ruby_interpreter="system"
- rvm_ruby_patch_level="" ; rvm_ruby_tag="" ; rvm_head_flag=0 ; rvm_ruby_revision="" ; rvm_ruby_version="" ; rvm_gemset_name=""
- return 0
- ;;
+ system)
+ rvm_ruby_interpreter="system"
+ rvm_ruby_patch_level="" ; rvm_ruby_tag="" ; rvm_head_flag=0 ; rvm_ruby_revision="" ; rvm_ruby_version="" ; rvm_gemset_name=""
+ return 0
+ ;;
- nightly)
- rvm_ruby_version="nightly"
- rvm_nightly_flag=1
- break
- ;;
+ nightly)
+ rvm_ruby_version="nightly"
+ rvm_nightly_flag=1
+ break
+ ;;
- preview*)
- rvm_ruby_patch_level="$string"
- ;;
+ preview*)
+ rvm_ruby_patch_level="$string"
+ ;;
- rc[[:digit:]]*)
- rvm_ruby_patch_level="$string"
- ;;
+ rc[[:digit:]]*)
+ rvm_ruby_patch_level="$string"
+ ;;
- [[:digit:]]\.[[:digit:]]*)
- rvm_ruby_version="$string"
- rvm_ruby_revision=""
- rvm_ruby_tag=""
- ;;
+ [[:digit:]]\.[[:digit:]]*)
+ rvm_ruby_version="$string"
+ rvm_ruby_revision=""
+ rvm_ruby_tag=""
+ ;;
- p[[:digit:]]*)
- rvm_ruby_patch_level="$string"
- ;;
+ p[[:digit:]]*)
+ rvm_ruby_patch_level="$string"
+ ;;
- #elif [[ -n "${rvm_ruby_version:-""}" ]] && "$rvm_scripts_path/match" "$string" "^
- [[:digit:]][[:digit:]]*)
+ #elif [[ -n "${rvm_ruby_version:-""}" ]] && "$rvm_path/scripts/match" "$string" "^
+ [[:digit:]][[:digit:]]*)
- case "${rvm_ruby_interpreter:-""}" in
- ree)
- rvm_ruby_patch_level="$string"
- rvm_ruby_revision=""
- ;;
+ case "${rvm_ruby_interpreter:-""}" in
+ ree)
+ rvm_ruby_patch_level="$string"
+ rvm_ruby_revision=""
+ ;;
- rbx)
- rvm_ruby_patch_level="$string"
- ;;
+ rbx)
+ rvm_ruby_patch_level="$string"
+ ;;
- maglev)
- rvm_ruby_version="$string"
- rvm_ruby_revision=""
- rvm_ruby_patch_level=""
- ;;
+ maglev)
+ rvm_ruby_version="$string"
+ rvm_ruby_revision=""
+ rvm_ruby_patch_level=""
+ ;;
- *)
- rvm_ruby_revision="r$string"
- ;;
- esac
- ;;
+ *)
+ rvm_ruby_revision="r$string"
+ ;;
+ esac
+ ;;
- r[[:digit:]]*)
- rvm_ruby_patch_level=""
- rvm_ruby_revision="$string"
- ;;
+ r[[:digit:]]*)
+ rvm_ruby_patch_level=""
+ rvm_ruby_revision="$string"
+ ;;
- s[[:digit:]]*)
- rvm_ruby_revision=""
- rvm_ruby_sha="$string"
- ;;
+ s[[:digit:]]*)
+ rvm_ruby_revision=""
+ rvm_ruby_sha="$string"
+ ;;
- tv[[:digit:]]* | t[[:digit:]]*)
- rvm_ruby_patch_level="" ; rvm_ruby_revision=""
- rvm_ruby_tag="$string"
- ;;
+ tv[[:digit:]]* | t[[:digit:]]*)
+ rvm_ruby_patch_level="" ; rvm_ruby_revision=""
+ rvm_ruby_tag="$string"
+ ;;
- m[[:digit:]]*)
- rvm_ruby_mode="$string"
+ m[[:digit:]]*)
+ rvm_ruby_mode="$string"
;;
u[[:alnum:]]*)
rvm_ruby_patch_level="" ; rvm_ruby_revision="" ; rvm_ruby_tag="" ; rvm_ruby_patch=""
rvm_ruby_user_tag="$string"
@@ -536,11 +554,11 @@
ruby|rbx|jruby|macruby|ree|rubinius|maglev|mput|shyouhei|ironruby)
rvm_ruby_interpreter="$string"
;;
*)
- "$rvm_scripts_path/log" "error" \
+ "$rvm_path/scripts/log" "error" \
"Unknown ruby string component: '$string'"
return 1
;;
esac
done
@@ -621,30 +639,30 @@
command -v gem > /dev/null
if [[ $? -gt 0 ]] ; then return 0 ; fi # Stop if no 'gem' command is available.
rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
rvm_gemset_name=${rvm_gemset_name:-""}
- rvm_ruby_global_gems_path="$rvm_path/gems/${rvm_ruby_string:-""}${rvm_gemset_separator}global"
+ rvm_ruby_global_gems_path="$rvm_path/gems/${rvm_ruby_string:-""}${rvm_gemset_separator:-"@"}global"
if [[ -z "${rvm_gemset_name:-""}" ]] ; then
# No longer defaulting to 'sticky' gem sets.
# Set 'rvm_sticky_flag=1' in ~/.rvmrc to enable.
if [[ ${rvm_sticky_flag:-0} -eq 1 ]] ; then
if [[ -n "${GEM_HOME:-""}" ]] ; then
- rvm_gemset_name=$(echo $GEM_HOME | xargs basename | awk -F${rvm_gemset_separator} '{print $2}')
+ rvm_gemset_name=$(echo $GEM_HOME | xargs basename | awk -F${rvm_gemset_separator:-"@"} '{print $2}')
fi
if [[ -n "${rvm_ruby_gem_home:-""}" ]] ; then
- rvm_gemset_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F${rvm_gemset_separator} '{print $2}')
+ rvm_gemset_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F${rvm_gemset_separator:-"@"} '{print $2}')
fi
fi
if ! echo "${rvm_gemset_name:-""}" | grep -q "^[[:digit:]]\.[[:digit:]]" ; then
- rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+ rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
else
if [[ -n "${rvm_ruby_string:-""}" && "${rvm_ruby_interpreter:-""}" != "system" ]] ; then
rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
@@ -666,17 +684,17 @@
fi
if [[ -n "${rvm_ruby_string:-""}" ]] ; then
if [[ -z "${rvm_ruby_gem_home:-""}" || -n "${gemset:-""}" ]] ; then
- rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+ rvm_ruby_gem_home="$rvm_gems_path/${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_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+ rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
fi
else
- "$rvm_scripts_path/log" "error" "Gemsets can not be used with non rvm controlled rubies (currently)."
+ "$rvm_path/scripts/log" "error" "Gemsets can not be used with non rvm controlled rubies (currently)."
return 1
fi
fi
if [[ -z "${GEM_HOME:-""}" ]] ; then unset GEM_HOME ; fi
@@ -684,22 +702,22 @@
# 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" ]] ; then
if [[ ${rvm_gemset_create_on_use_flag:-0} -ne 1 && ${rvm_create_flag:-0} -ne 1 && ${rvm_delete_flag:-0} -ne 1 ]] ; then
- "$rvm_scripts_path/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+ "$rvm_path/scripts/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
return 1
fi
elif [[ ${rvm_delete_flag:-0} -eq 1 ]] ; then
return 1
fi
if [[ -z "${rvm_ruby_gem_home:-""}" && -n "${rvm_ruby_string:-""}" ]] ; then
rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
- rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator}global"
+ rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator:-"@"}global"
fi
rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
# Ensure that the ruby gem home exists.
@@ -716,45 +734,45 @@
}
# Use a gemset specified by 'rvm_ruby_gem_home'
__rvm_gemset_use() {
if [[ -z "${rvm_gemset_name:-""}" ]] ; then
- "$rvm_scripts_path/log" "error" "Gemset was not given.\n Usage:\n rvm gemset use <gemsetname>\n"
+ "$rvm_path/scripts/log" "error" "Gemset was not given.\n Usage:\n rvm gemset use <gemsetname>\n"
return 1
fi
if [[ -n "${rvm_ruby_gem_home:-""}" ]] ; then
if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
if [[ ${rvm_gemset_create_on_use_flag:-0} -eq 1 || ${rvm_create_flag:-0} -eq 1 ]] ; then
- "$rvm_scripts_path/gemsets" create "$rvm_gemset_name"
+ "$rvm_path/scripts/gemsets" create "$rvm_gemset_name"
else
- "$rvm_scripts_path/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+ "$rvm_path/scripts/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
return 1
fi
fi
if [[ ${rvm_interactive_flag:-0} -gt 0 && ${rvm_verbose_flag:-1} -ne 0 ]] ; then
- "$rvm_scripts_path/log" "info" "Now using gemset '${rvm_gemset_name:-default}'"
+ "$rvm_path/scripts/log" "info" "Now using gemset '${rvm_gemset_name:-default}'"
fi
- rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator}*}${rvm_gemset_separator}${rvm_gemset_name}"
+ rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
GEM_HOME="$rvm_ruby_gem_home"
BUNDLE_PATH="$rvm_ruby_gem_home"
- GEM_PATH="$rvm_ruby_gem_home/bin:$(echo "$GEM_HOME" | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}global/bin"
+ GEM_PATH="$rvm_ruby_gem_home/bin:$(echo "$GEM_HOME" | sed 's/'${rvm_gemset_separator:-"@"}'.*$//')${rvm_gemset_separator:-"@"}global/bin"
export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
__rvm_use # Now ensure the selection takes effect for the environment.
fi
return 0
}
__rvm_gemset_clear() {
rvm_gemset_name="" ; shift # TODO: Is this shift necessary???
- rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-'@'}*}"
- rvm_ruby_global_gems_path="$(echo "${GEM_HOME:-""}" | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}global"
+ rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}"
+ rvm_ruby_global_gems_path="$(echo "${GEM_HOME:-""}" | sed 's/'${rvm_gemset_separator:-"@"}'.*$//')${rvm_gemset_separator:-"@"}global"
GEM_HOME=$rvm_ruby_gem_home
BUNDLE_PATH="$rvm_ruby_gem_home"
GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"
export rvm_ruby_gem_home rvm_ruby_global_gems_path GEM_HOME BUNDLE_PATH GEM_PATH
__rvm_use # Now ensure the selection takes effect for the environment.