X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=98bc333938d2bb9168b88487b095f7b1e44c6358;hb=d8558f23f38c61a4a9da5bac3eacd94238c30e36;hp=8fba53d6c3a908029532278635bbb52647068268;hpb=5994535a9fd47190a54ac1a0d723cd64ec713641;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index 8fba53d6..98bc3339 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -21,7 +21,16 @@
 # 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'
+# Most of the string processing across rbot is done against IRC messages, which
+# do not have a well-defined encoding. Although many clients are now using
+# UTF-8, there is no guarantee that an arbitrary string received from IRC will
+# be UTF-8 encoded. We have to force ASCII (byte-wise/charset agnostic)
+# matching because otherwise some strings can give problems: in particular, for
+# example, the bytesequence "\340\350\354\362\371" (that is the aeiou vowels,
+# each with a grave accent) will cause the string to be considered up to the
+# "\354" (i with grave accent) only: so either the rest of the message is
+# ignored, or the matching fails.
+$KCODE = 'a'
 
 $VERBOSE=true
 
@@ -33,22 +42,41 @@ $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}"
+  if defined?(SVN_DIR) and File.exists?(File.join(SVN_DIR, '.git'))
+    $version.sub!('svn', 'git')
+
+    git_out = `git status`
+
+    git_out.match(/^# On branch (.*)\n/)
+    branch = $1.dup || "unknown"
+    changed = git_out.match(/^# Change(.*)\n/)
+    rev = "revision "
+    git_out = `git log -1 --pretty=format:"%h%n%b"`.split("\n")
+    rev << git_out.first
+    if git_out.last.match(/^git-svn-id: \S+@(\d+)/)
+      rev << "(svn #{$1})"
     end
-    svn_st = `svn st #{up}`
-    if svn_st =~ /^M /
-      rev << ", local changes"
+    rev << ", local changes" if changed
+
+    $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
-    rev << ")"
-  rescue => e
-    puts e.inspect
+    $version += rev
   end
-  $version += rev
 end
 
 orig_opts = ARGV.dup
@@ -59,6 +87,7 @@ opts = GetoptLong.new(
   ["--help",  "-h", GetoptLong::NO_ARGUMENT],
   ["--loglevel",  "-l", GetoptLong::REQUIRED_ARGUMENT],
   ["--trace",  "-t", GetoptLong::REQUIRED_ARGUMENT],
+  ["--pidfile", "-p", GetoptLong::REQUIRED_ARGUMENT],
   ["--version", "-v", GetoptLong::NO_ARGUMENT]
 )
 
@@ -71,7 +100,7 @@ opts.each {|opt, arg|
   $opts[opt.sub(/^-+/, "")] = arg
 }
 
-$cl_loglevel = $opts["loglevel"].to_i
+$cl_loglevel = $opts["loglevel"].to_i if $opts["loglevel"]
 
 if ($opts["trace"])
   set_trace_func proc { |event, file, line, id, binding, classname|
@@ -108,11 +137,12 @@ if ($opts["help"])
   puts "  -v, --version      version information"
   puts "  -d, --debug        enable debug messages"
   puts "  -b, --background   background (daemonize) the bot"
+  puts "  -p, --pidfile      write the bot pid to this file"
   puts "config directory defaults to ~/.rbot"
   exit 0
 end
 
-if(bot = Irc::IrcBot.new(ARGV.shift, :argv => orig_opts))
+if(bot = Irc::Bot.new(ARGV.shift, :argv => orig_opts))
   # just run the bot
   bot.mainloop
 end