Merge branch 'master' of ssh://ruby-rbot.org/var/git/rbot

[user/henk/code/ruby/rbot.git] / lib / rbot / rbotconfig.rb

diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index a282d77090b1641f7dd4226bb772d2bda705ed44..97f8173eaa2dbaa0082f8bccd1c09c7f3af974a9 100644 (file)
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -1,4 +1,5 @@
 module Irc
+class Bot
   module Config
     unless defined?(@@datadir)
       @@datadir = nil
@@ -27,7 +28,7 @@ module Irc
         debug "trying to load rubygems"
         require 'rubygems'
         debug "loaded rubygems, looking for rbot-#$version"
-        if $version =~ /(.*)-svn\Z/
+        if $version =~ /(.*)-(svn|git)\Z/
           version = $1
         else
           version = $version
@@ -66,3 +67,4 @@ module Irc
     end
   end
 end
+end