X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=89c8688de2e179f3f062ec5a2c2fa5b26919faac;hb=a78b475c7f5088f31c880f2d475ba144b6cab7a3;hp=8e762569000eef1886ad77cbf961b893e3f7d84f;hpb=c602a6081007ae1e49a912c13fec0685bb9f9263;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index 8e762569..89c8688d 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -36,37 +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.
-
-# 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'
+# This is free software, see COPYING for licensing details
 
 $VERBOSE=true
 
@@ -74,31 +47,35 @@ require 'etc'
 require 'getoptlong'
 require 'fileutils'
 
-$version="0.9.11-svn"
+$version="0.9.11-git"
 $opts = Hash.new
 
-if $version =~ /svn/
-  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/)
-    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})"
+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
-      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})"