scripts/utility in rvm-1.0.13 vs scripts/utility in rvm-1.0.14
- old
+ new
@@ -46,11 +46,11 @@
fi
fi
- unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_project_rvmrc_default rvm_action
+ unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_action
[[ ${rvm_dump_environment_flag:-0} -eq 1 ]] && __rvm_dump_environment
return 0
}
@@ -115,15 +115,15 @@
key=${1:-""}
variable=${2:-""}
if [[ -f "$rvm_path/config/user" ]] ; then
- value="$($rvm_path/scripts/db "$rvm_path/config/user" "$key")"
+ value="$("$rvm_path/scripts/db" "$rvm_path/config/user" "$key")"
fi
if [[ -z "$value" ]] ; then
- value="$($rvm_path/scripts/db "$rvm_path/config/db" "$key")"
+ value="$("$rvm_path/scripts/db" "$rvm_path/config/db" "$key")"
fi
if [[ -n "$value" ]] ; then
if [[ -z "$variable" ]] ; then
echo $value
@@ -812,12 +812,12 @@
./scripts/install
else
builtin cd "${rvm_src_path:-"$rvm_path/src"}" && \
- ( git clone --depth 1 git://github.com/wayneeseguin/rvm.git || \
- git clone http://github.com/wayneeseguin/rvm.git ) && \
+ ( git clone http://github.com/wayneeseguin/rvm.git || \
+ git clone --depth 1 git://github.com/wayneeseguin/rvm.git ) && \
builtin cd rvm/ && ./scripts/install
fi
else
version_url="http://rvm.beginrescueend.com/releases/stable-version.txt"
@@ -1418,11 +1418,11 @@
local recorded_ruby_name rvm_install_record_file rvm_install_command
[[ -z "$1" ]] && return
- recorded_ruby_name="$($rvm_path/scripts/tools strings "$1")"
+ recorded_ruby_name="$("$rvm_path/scripts/tools" strings "$1")"
rvm_install_record_file="$rvm_path/config/installs"
rvm_install_command=$(printf "$recorded_ruby_name $rvm_install_arguments\n")
@@ -1444,11 +1444,11 @@
__rvm_remove_install_record()
{
local recorded_ruby_name rvm_install_record_file
- recorded_ruby_name="$($rvm_path/scripts/tools strings "$1")"
+ recorded_ruby_name="$("$rvm_path/scripts/tools" strings "$1")"
rvm_install_record_file="$rvm_path/config/installs"
if [[ -s "$rvm_install_record_file" ]]; then
@@ -1465,10 +1465,10 @@
__rvm_recorded_install_command()
{
local recorded_ruby_name recorded_ruby_match
- recorded_ruby_name="$($rvm_path/scripts/tools strings "$1" \
+ recorded_ruby_name="$("$rvm_path/scripts/tools" strings "$1" \
| awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
[[ -z "$recorded_ruby_name" ]] && return 1
recorded_ruby_match="^$recorded_ruby_name "