Permalink
Browse files

Merge branch 'master' into feature/requirements_exec

  • Loading branch information...
2 parents 6bcdef0 + 5048419 commit 8299ae145315fca3a3064884ff1e58490e8a00d3 @mpapis mpapis committed Jan 15, 2013
Showing with 16 additions and 5 deletions.
  1. +1 −1 scripts/cli
  2. +1 −1 scripts/functions/environment
  3. +1 −1 scripts/functions/utility
  4. +13 −2 scripts/selector
View
@@ -646,7 +646,7 @@ __rvm_parse_args()
export "rvm_${rvm_token}_flag"=1
;;
- --self|--gem|--rubygems|--reconfigure|--default|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--cron|--tail|--delete|--verbose|--import|--sticky|--create|--gems|--docs|--skip-autoreconf|--force-autoconf|--auto|--autoinstall-bundler|--disable-binary|--ignore-gemsets|--skip-gemsets|--debug|--quiet|--silent|--skip-openssl)
+ --self|--gem|--rubygems|--reconfigure|--default|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--cron|--tail|--delete|--verbose|--import|--sticky|--create|--gems|--docs|--skip-autoreconf|--force-autoconf|--auto|--autoinstall-bundler|--disable-binary|--ignore-gemsets|--skip-gemsets|--debug|--quiet|--silent|--skip-openssl|--fuzzy)
rvm_token=${rvm_token#--}
rvm_token=${rvm_token//-/_}
export "rvm_${rvm_token}_flag"=1
@@ -235,7 +235,7 @@ __variables_definition()
rvm_gemset_separator rvm_expanding_aliases rvm_architectures rvm_tar_command rvm_tar_options
rvm_patch_original_pwd rvm_project_rvmrc rvm_archive_extension rvm_autoinstall_bundler_flag
rvm_codesign_identity rvm_expected_gemset_name rvm_with_gems rvm_without_gems rvm_force_clang_ok
- rvm_ignore_dotfiles_flag rvm_latest_binary_flag
+ rvm_ignore_dotfiles_flag rvm_latest_binary_flag rvm_fuzzy_flag
)
__array_list=(
@@ -324,7 +324,7 @@ __rvm_ask_for()
typeset response
rvm_warn "$1"
printf "%b" "(anything other than '$2' will cancel) > "
- read response
+ read response || return $?
[[ "$2" == "$response" ]] || return $?
}
View
@@ -979,14 +979,25 @@ __rvm_ruby_string()
else
if
- (( ${rvm_latest_binary_flag:-0} == 1 ))
+ (( ${rvm_fuzzy_flag:-0} == 1 )) &&
+ [[ "${rvm_ruby_interpreter}" == "ruby" || "${rvm_ruby_interpreter}" == "ree" ]]
+ then
+ rvm_ruby_patch_level="$(
+ "${rvm_scripts_path:-$rvm_path/scripts}/list" strings |
+ grep "${rvm_ruby_interpreter}-${rvm_ruby_version}-" |
+ awk -F- '{print $3}' | sort | tail -n 1
+ )"
+ fi
+ if
+ (( ${rvm_latest_binary_flag:-0} == 1 )) &&
+ [[ "${rvm_ruby_interpreter}" == "ruby" || "${rvm_ruby_interpreter}" == "ree" ]]
then
#TODO: MRI only implementation, we need a better db/format/handling for this
rvm_ruby_patch_level="$(
__list_remote_rubies_for $( __rvm_system_path_for rubies ) |
awk -F/ '{x=$NF; gsub(".tar.*","",x); print x}' |
grep "${rvm_ruby_interpreter}-${rvm_ruby_version}-" |
- awk -F- '{print $3}' | tail -n 1
+ awk -F- '{print $3}' | sort | tail -n 1
)"
fi
[[ -n "${rvm_ruby_patch_level:-""}" ]] ||

0 comments on commit 8299ae1

Please sign in to comment.