summaryrefslogtreecommitdiff
path: root/lib/rbot/rbotconfig.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rbot/rbotconfig.rb')
-rw-r--r--lib/rbot/rbotconfig.rb30
1 files changed, 21 insertions, 9 deletions
diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index 212df990..32bd66d4 100644
--- a/lib/rbot/rbotconfig.rb
+++ b/lib/rbot/rbotconfig.rb
@@ -1,17 +1,23 @@
module Irc
module Config
@@datadir = nil
+ @@coredir = nil
- # first try for the default path to the data dir
- defaultdir = File.expand_path(File.dirname($0) + '/../data')
+ # 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')
- if File.directory? "#{defaultdir}/rbot"
- @@datadir = "#{defaultdir}/rbot"
+ if File.directory? defaultdatadir
+ @@datadir = defaultdatadir
end
-
+
+ if File.directory? defaultcoredir
+ @@coredir = defaultcoredir
+ end
+
# setup pkg-based configuration - i.e. where were we installed to, where
# are our data files, etc.
- if @@datadir.nil?
+ if @@datadir.nil? or @@coredir.nil?
begin
debug "trying to load rubygems"
require 'rubygems'
@@ -26,6 +32,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"
else
debug "not installed via rubygems"
end
@@ -34,18 +41,23 @@ module Irc
end
end
- if @@datadir.nil?
+ if @@datadir.nil? or @@coredir.nil?
begin
require 'rbot/pkgconfig'
@@datadir = PKGConfig::DATADIR
+ @@coredir = PKGConfig::COREDIR
rescue LoadError
- error "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