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 32bd66d409c2f2d0eb03676c01439b6654587c7f..97f8173eaa2dbaa0082f8bccd1c09c7f3af974a9 100644 (file)
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -1,18 +1,24 @@
 module Irc
+class Bot
   module Config
-    @@datadir = nil
-    @@coredir = nil
+    unless defined?(@@datadir)
+      @@datadir = nil
 
-    # first try for the default path to the data dir
-    defaultdatadir = File.expand_path(File.dirname($0) + '/../data/rbot')
-    defaultcoredir = File.expand_path(File.dirname($0) + '/../lib/rbot/core')
+      defaultdatadir = File.expand_path(File.dirname($0) + '/../data/rbot')
 
-    if File.directory? defaultdatadir
-      @@datadir = defaultdatadir
+      if File.directory? defaultdatadir
+        @@datadir = defaultdatadir
+      end
     end
 
-    if File.directory? defaultcoredir
-      @@coredir = defaultcoredir
+    unless defined?(@@coredir)
+      @@coredir = nil
+
+      defaultcoredir = File.expand_path(File.dirname($0) + '/../lib/rbot/core')
+
+      if File.directory? defaultcoredir
+        @@coredir = defaultcoredir
+      end
     end
 
     # setup pkg-based configuration - i.e. where were we installed to, where
@@ -22,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
@@ -32,7 +38,7 @@ module Irc
         if gem && path = gem.full_gem_path
           debug "installed via rubygems to #{path}"
           @@datadir = "#{path}/data/rbot"
-          @@datadir = "#{path}/lib/rbot/core"
+          @@coredir = "#{path}/lib/rbot/core"
         else
           debug "not installed via rubygems"
         end
@@ -61,3 +67,4 @@ module Irc
     end
   end
 end
+end