X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=ce5c86bd9fb82446c17897aa8ec0bdafbf376129;hb=2c691f2dc9e6e3e1571218a6ad9c131359d37ffd;hp=886f820aa1d97162fd04dd0bd5d7d7675a387095;hpb=d8f47b0899f9ba055735250e91ac861e8adde447;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index 886f820a..ce5c86bd 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -21,44 +21,39 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+$KCODE = 'u'
+
 $VERBOSE=true
 
 require 'etc'
 require 'getoptlong'
 require 'fileutils'
-require 'rbconfig'
 
-begin
-  require 'rbot/ircbot'
-rescue LoadError => e
-  puts "Error: couldn't find the rbot/ircbot module for loading\n - did you install rbot using install.rb?"
-  exit 2
-end
-  
-$debug = false
-$version="0.9.9"
+$version="0.9.11-svn"
 $opts = Hash.new
 
-# print +message+ if debugging is enabled
-def debug(message=nil)
-  print "DEBUG: #{message}\n" if($debug && message)
-  #yield
-end
-
 orig_opts = ARGV.dup
 
 opts = GetoptLong.new(
+  ["--background", "-b", GetoptLong::NO_ARGUMENT],
   ["--debug", "-d", GetoptLong::NO_ARGUMENT],
   ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+  ["--loglevel",  "-l", GetoptLong::REQUIRED_ARGUMENT],
   ["--trace",  "-t", GetoptLong::REQUIRED_ARGUMENT],
   ["--version", "-v", GetoptLong::NO_ARGUMENT]
 )
 
+$debug = false
+$daemonize = false
+
 opts.each {|opt, arg|
   $debug = true if(opt == "--debug")
+  $daemonize = true if(opt == "--background")
   $opts[opt.sub(/^-+/, "")] = arg
 }
 
+$cl_loglevel = $opts["loglevel"].to_i
+
 if ($opts["trace"])
   set_trace_func proc { |event, file, line, id, binding, classname|
     if classname.to_s == $opts["trace"]
@@ -67,6 +62,21 @@ if ($opts["trace"])
   }
 end
 
+defaultlib = File.expand_path(File.dirname($0) + '/../lib')
+
+if File.directory? "#{defaultlib}/rbot"
+  unless $:.include? defaultlib
+    $:.unshift defaultlib
+  end
+end
+  
+begin
+  require 'rbot/ircbot'
+rescue LoadError => e
+  puts "Error: couldn't find the rbot/ircbot module (or one of its dependencies)\n"
+  puts e
+  exit 2
+end
 
 if ($opts["version"])
   puts "rbot #{$version}"
@@ -78,6 +88,7 @@ if ($opts["help"])
   puts "  -h, --help         this message"
   puts "  -v, --version      version information"
   puts "  -d, --debug        enable debug messages"
+  puts "  -b, --background   background (daemonize) the bot"
   puts "config directory defaults to ~/.rbot"
   exit 0
 end