X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=8fba53d6c3a908029532278635bbb52647068268;hb=dcc2a88cb8529d7e393f1b96e84f6c94a864e4f9;hp=58f2bdfceef8c65b503ef577954bc42e2ab92b00;hpb=6dad1b9c510db00be89196ee3cf514046c1e35a8;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index 58f2bdfc..8fba53d6 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -21,30 +21,58 @@
 # 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'
 
-$version="0.9.9 svn [$LastChangedRevision$]"
+$version="0.9.11-svn"
 $opts = Hash.new
 
+if $version =~ /svn/
+  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 =~ /^M /
+      rev << ", local changes"
+    end
+    rev << ")"
+  rescue => e
+    puts e.inspect
+  end
+  $version += rev
+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"]
@@ -53,10 +81,19 @@ 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 for loading\n - did you install rbot using setup.rb?"
+  puts "Error: couldn't find the rbot/ircbot module (or one of its dependencies)\n"
+  puts e
   exit 2
 end
 
@@ -70,6 +107,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