X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=cfcb048511052d2791487f245f6eb1ac43b72860;hb=3ace72d5642284665fce2c33c99dfeb1b931b2c6;hp=cee5974a05331920187a3dc4dff306a1d5dfeac5;hpb=b09833f9d0e01ed655ddec5f73f3a7dd07aafee4;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index cee5974a..cfcb0485 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -41,64 +41,14 @@ 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
 
-if $version =~ /git/
-  if defined?(SCM_DIR) and File.exists?(File.join(SCM_DIR, '.git'))
-    begin
-      git_out = `git status`
-      git_out.match(/^# On branch (.*)\n/)
-      if $1 # git 1.5.x
-        branch = $1.dup || "unknown"
-        changed = git_out.match(/^# Change(.*)\n/)
-        rev = "revision "
-        git_out = `git log -1 --pretty=format:"%h%n%b%n%ct"`.split("\n")
-        rev << git_out.first
-        $version_timestamp = git_out.last.to_i
-        if git_out[1].match(/^git-svn-id: \S+@(\d+)/)
-          rev << "(svn #{$1})"
-        end
-        rev << ", local changes" if changed
-      else # older gits
-        git_out = `git branch`
-        git_out.match(/^\* (.*)\n/)
-        branch = $1.dup rescue "unknown"
-        rev = "revision " + `git rev-parse HEAD`[0,6]
-      end
-    rescue => e
-      puts e.inspect
-      branch = "unknown branch"
-      rev = "unknown revision"
-    end
-
-    $version << " (#{branch} branch, #{rev})"
-  else
-    up = File.dirname(__FILE__) + "/.."
-    rev = " (unknown revision)"
-    begin
-      svn_out = `svn info #{up}`
-      if svn_out =~ /Last Changed Rev: (\d+)/
-        rev = " (revision #{$1}"
-      end
-      svn_st = `svn st #{up}`
-      if svn_st =~ /^[MDA] /
-        rev << ", local changes"
-      end
-      rev << ")"
-    rescue => e
-      puts e.inspect
-    end if File.directory?(File.join(up, '.svn'))
-    $version += rev
-  end
-end
-
 orig_opts = ARGV.dup
 
 opts = GetoptLong.new(
@@ -111,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"]
@@ -137,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"
@@ -163,8 +111,17 @@ if ($opts["help"])
   exit 0
 end
 
+# setup logger based on command line arguments
+loglevel = $opts['loglevel'] ? $opts['loglevel'].to_i : nil
+loglevel = $opts['debug'] ? 0 : loglevel
+if loglevel
+  Irc::Bot::LoggerManager.instance.set_level(loglevel)
+end
+
 if(bot = Irc::Bot.new(ARGV.shift, :argv => orig_opts))
   # just run the bot
   bot.mainloop
 end
 
+Irc::Bot::LoggerManager.instance.flush
+Irc::Bot::LoggerManager.instance.halt_logger