Improve launch_here script with the suggestions from ticket #112

1 files changed, 15 insertions, 20 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')