Version 0.9.11-rc1

diff --git a/bin/rbot b/bin/rbot
index 26fb79ab02b163ea05bb4ab36a36dd4d258c0b0e..96466f4af0eabb78588b080835f5b8766794999e 100755 (executable)
--- a/bin/rbot
+++ b/bin/rbot
@@ -47,7 +47,7 @@ require 'etc'
 require 'getoptlong'
 require 'fileutils'
 
-$version ||= "0.9.11-git"
+$version ||= "0.9.11-rc1"
 $version_timestamp ||= 0
 $opts = Hash.new
 

diff --git a/launch_here.rb b/launch_here.rb
index b368f4c62b6149b231dbfba1db107ec529071fa5..0978ac4f508196bf8faa5e5cd23ed21bb65ebaa6 100755 (executable)
--- a/launch_here.rb
+++ b/launch_here.rb
@@ -8,7 +8,7 @@ puts "Running from #{SCM_DIR}"
 
 $:.unshift File.join(SCM_DIR, 'lib')
 
-$version = '0.9.11-git'
+$version = '0.9.11-rc1'
 
 pwd = Dir.pwd
 begin

diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index 692113a90d5c288e1e981afc0905abd9f7524291..eb55f96533e24eda007f39ce61e8c5c268b7e2f2 100644 (file)
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -27,7 +27,7 @@ class Bot
       begin
         debug "trying to load rubygems"
         require 'rubygems'
-        if $version =~ /^(.*)-git( .*)?$/
+        if $version =~ /^(.*)-(?:git|rc\d)(?: .*)?$/
           version = $1
         else
           version = $version