X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Frbot%2Frbotconfig.rb;h=eb55f96533e24eda007f39ce61e8c5c268b7e2f2;hb=836cf49c210ebfeb443861d26379a81b333c2c78;hp=32bd66d409c2f2d0eb03676c01439b6654587c7f;hpb=5cc6ece3d483db28f92f82a78b926ba6ce62769d;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index 32bd66d4..eb55f965 100644
--- 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
@@ -21,18 +27,18 @@ module Irc
       begin
         debug "trying to load rubygems"
         require 'rubygems'
-        debug "loaded rubygems, looking for rbot-#$version"
-        if $version =~ /(.*)-svn\Z/
+        if $version =~ /^(.*)-(?:git|rc\d)(?: .*)?$/
           version = $1
         else
           version = $version
         end
+        debug "loaded rubygems, looking for rbot version #{$version} (rbot-#{version})"
         gemname, gem = Gem.source_index.find{|name, spec| spec.name == 'rbot' && spec.version.version == version}
         debug "got gem #{gem}"
         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