lib/rconf/configurators/ruby_configurator.rb in rconf-1.0.11 vs lib/rconf/configurators/ruby_configurator.rb in rconf-1.0.12
- old
+ new
@@ -104,13 +104,13 @@
# Bail if rbenv isn't correctly initialized (we can't use it in this state)
post_note "rconf detected rbenv is installed in #{rbenv_path} but it is not in the PATH.\n" + PATH_ADVICE
aborting(true)
elsif rbenv_in_path
# rbenv is installed and initialized; make sure we have a suitable version
- res.output =~ /^rbenv ([0-9]+)\.([0-9]+)\.([0-9]+)$/
- maj, min, build = [$1.to_i, $2.to_i, $3.to_i]
+ res.output =~ /^rbenv ([0-9]+)\.([0-9]+)\.([0-9]+)(\-.*)?$/
+ maj, min, build, subhash = [$1.to_i, $2.to_i, $3.to_i, $4]
if maj == 0 && min < 4
- report_fatal("rconf requires rbenv version 0.4.0 or greater, you have #{maj}.#{min}.#{build} installed, "+
+ report_fatal("rconf requires rbenv version 0.4.0 or greater, you have #{maj}.#{min}.#{build}#{subhash} installed, "+
"please upgrade (e.g. via 'brew upgrade rbenv') and try again")
end
else
# No sign of rbenv; try to install it
install_rbenv_from_git