X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Frbotconfig.rb;h=a282d77090b1641f7dd4226bb772d2bda705ed44;hb=c986bc82f4b856818e97e24fbf5fc11eef5f25c2;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..a282d770 100644
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -1,18 +1,23 @@
 module Irc
   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
@@ -32,7 +37,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