X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Frbotconfig.rb;h=d6f6bcdeca67dfa74a38d2fac8f82f152991aba6;hb=f287bf1e73829434d92b46c333c3185373198518;hp=fad7b032963b00d37629cb0e67e8a347e2f3360e;hpb=dd0b318cfd3df017b1ec4e44afc2f4e412fd2033;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index fad7b032..d6f6bcde 100644
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -1,33 +1,70 @@
 module Irc
+class Bot
   module Config
-    @@datadir = nil
+    unless defined?(@@datadir)
+      @@datadir = nil
+
+      defaultdatadir = File.expand_path(File.dirname($0) + '/../data/rbot')
+
+      if File.directory? defaultdatadir
+        @@datadir = defaultdatadir
+      end
+    end
+
+    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
     # are our data files, etc.
-    begin
-      require 'rubygems'
-      gemname, gem = Gem.source_index.find{|name, spec| spec.name == 'rbot' && spec.version.version == $version}
-      if gem && path = gem.full_gem_path
-        debug "installed via rubygems to #{path}"
-        @@datadir = "#{path}/data/rbot"
-      else
-        debug "not installed via rubygems"
+    if @@datadir.nil? or @@coredir.nil?
+      begin
+        debug "trying to load rubygems"
+        require 'rubygems'
+        if $version =~ /^(.*)-(?:git|rc\d)(?: .*)?$/
+          version = $1
+        else
+          version = $version
+        end
+        debug "loaded rubygems, looking for rbot version #{$version} (rbot-#{version})"
+        gem = Gem::Specification.find{|spec| spec.name == 'rbot' && spec.version.version == version}
+        if gem
+          path = gem.full_gem_path
+          debug "installed via rubygems to #{path}"
+          @@datadir = "#{path}/data/rbot"
+          @@coredir = "#{path}/lib/rbot/core"
+        else
+          debug "not installed via rubygems"
+        end
+      rescue LoadError,NameError,NoMethodError
+        debug "no rubygems installed"
       end
-    rescue LoadError
-      debug "no rubygems installed"
     end
 
-    if @@datadir.nil?
+    if @@datadir.nil? or @@coredir.nil?
       begin
         require 'rbot/pkgconfig'
         @@datadir = PKGConfig::DATADIR
+        @@coredir = PKGConfig::COREDIR
       rescue LoadError
-        puts "fatal - no way to determine data dir"
+        error "fatal - no way to determine data or core dir"
         exit 2
       end
     end
-    
+
     def Config.datadir
       @@datadir
     end
+
+    def Config.coredir
+      @@coredir
+    end
   end
 end
+end