use m.thread.nil? rather than longer m.thread == nil

[user/henk/code/ruby/rbot.git] / bin / rbot

diff --git a/bin/rbot b/bin/rbot
index a5b7865af7f17101a1e89bf4f560a0c215b0b3a9..89c8688de2e179f3f062ec5a2c2fa5b26919faac 100755 (executable)
--- a/bin/rbot
+++ b/bin/rbot
@@ -36,26 +36,10 @@ Please note that the logfile doesn't contain IRC logs (which are located at
 
 =end
 
-# Copyright (C) 2002 Tom Gilbert.
+# Copyright (C) 2002-2006 Tom Gilbert.
+# Copyright (C) 2007-2008 Giuseppe Bilotta and the rbot development team
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies of the Software and its documentation and acknowledgment shall be
-# given in the documentation and software packages that this Software was
-# used.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# 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.
+# This is free software, see COPYING for licensing details
 
 $VERBOSE=true
 
@@ -68,24 +52,30 @@ $opts = Hash.new
 
 if $version =~ /git/
   if defined?(SCM_DIR) and File.exists?(File.join(SCM_DIR, '.git'))
-    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"`.split("\n")
-      rev << git_out.first
-      if git_out.last.match(/^git-svn-id: \S+@(\d+)/)
-        rev << "(svn #{$1})"
+    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
-      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]
+    rescue => e
+      puts e.inspect
+      branch = "unknown branch"
+      rev = "unknown revision"
     end
 
     $version << " (#{branch} branch, #{rev})"