2 files changed, 29 insertions, 29 deletions
diff --git a/launch_here.rb b/launch_here.rb
index 6c48ae08..ad149d68 100755
--- a/launch_here.rb
+++ b/launch_here.rb
@@ -1,23 +1,18 @@
-#!/usr/bin/ruby
-#
-# Load rbot from this directory. (No need to install it with setup.rb)
-#
-
-BASEDIR = Dir.pwd
-
-#puts "Load path: #{$LOAD_PATH.inspect}"
+#!/usr/bin/ruby
+#
+# Load rbot from this directory. (No need to install it with setup.rb)
+#
+
+SVN_DIR = File.expand_path(File.dirname('__FILE__'))
+puts "Running from #{SVN_DIR}"
+
+$:.unshift File.join(SVN_DIR, 'lib')
 
-def add_to_path(dir)
-  $LOAD_PATH.unshift dir
-end
-
 module Irc
-  module PKGConfig
-    DATADIR = File.join BASEDIR, 'data/rbot'
-    COREDIR = File.join BASEDIR, 'lib/rbot/core'
+  module Config
+    @@datadir = File.join SVN_DIR, 'data/rbot'
+    @@coredir = File.join SVN_DIR, 'lib/rbot/core'
   end
-end
-
-add_to_path( File.join BASEDIR, 'lib' )
-
-load( File.join BASEDIR, 'bin/rbot' )
+end
+
+load File.join(SVN_DIR, 'bin/rbot')
diff --git a/lib/rbot/rbotconfig.rb b/lib/rbot/rbotconfig.rb
index 409ab9f8..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