X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=86f907cfff93e919475c5b1eddbd5d2ee2c99d71;hb=acc946be5b8d9042fb2a9263ba11d5ded2a509bb;hp=d2f53eb42d78ca90952fa438e4ac047f54f89ae7;hpb=c53a13e0be7ad9f569bee2ce450b875f5abe7de5;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index d2f53eb4..86f907cf 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -41,13 +41,12 @@ Please note that the logfile doesn't contain IRC logs (which are located at
 #
 # This is free software, see COPYING for licensing details
 
-$VERBOSE=true
-
 require 'etc'
 require 'getoptlong'
 require 'fileutils'
 
-$version ||= "0.9.11-git"
+$version ||= '0.9.15'
+$version_timestamp ||= 0
 $opts = Hash.new
 
 orig_opts = ARGV.dup
@@ -62,17 +61,13 @@ opts = GetoptLong.new(
   ["--version", "-v", GetoptLong::NO_ARGUMENT]
 )
 
-$debug = $DEBUG
 $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["loglevel"]
-
 if ($opts["trace"])
   set_trace_func proc { |event, file, line, id, binding, classname|
     if classname.to_s == $opts["trace"]
@@ -88,8 +83,10 @@ if File.directory? "#{defaultlib}/rbot"
     $:.unshift defaultlib
   end
 end
-  
+
 begin
+  Encoding.default_internal = Encoding::UTF_8
+  Encoding.default_external = Encoding::UTF_8
   require 'rbot/ircbot'
 rescue LoadError => e
   puts "Error: couldn't find the rbot/ircbot module (or one of its dependencies)\n"
@@ -115,6 +112,13 @@ if ($opts["help"])
 end
 
 if(bot = Irc::Bot.new(ARGV.shift, :argv => orig_opts))
+  # setup logger based on command line arguments
+  loglevel = $opts['loglevel'] ? $opts['loglevel'].to_i : nil
+  loglevel = $opts['debug'] ? 0 : nil
+  if loglevel
+    Irc::Bot::LoggerManager.instance.set_level(loglevel)
+  end
+
   # just run the bot
   bot.mainloop
 end