X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Frbotconfig.rb;h=894a1b65d7a9d5b0780d5f48aded2c39d3eff9f8;hb=452e323bfdb73d6b93ab96f5fc417891e4aa8f53;hp=97f8173eaa2dbaa0082f8bccd1c09c7f3af974a9;hpb=15846be1af87eefbb2d339c4c28ffbc9c1268d6a;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index 97f8173e..894a1b65 100644
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -27,18 +27,22 @@ class Bot
       begin
         debug "trying to load rubygems"
         require 'rubygems'
-        debug "loaded rubygems, looking for rbot-#$version"
-        if $version =~ /(.*)-(svn|git)\Z/
+        if $version =~ /^(.*)-(?:git|rc\d)(?: .*)?$/
           version = $1
         else
           version = $version
         end
-        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 "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"
+          if File.directory? "#{path}/data/rbot"
+            @@datadir = "#{path}/data/rbot"
+          end
+          if File.directory? "#{path}/lib/rbot/core"
+            @@coredir = "#{path}/lib/rbot/core"
+          end
         else
           debug "not installed via rubygems"
         end