X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=06e6db306dc4b22699f0d2191604280818b82228;hb=fd7b5cc1b0a07dcb61bf09db0c9d94946c7583fe;hp=ed6b57f85c93181420764494057d49f3326fe18a;hpb=36f349f3f005ab105c7e665dfee00b9b7e8d6939;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index ed6b57f8..06e6db30 100755
--- 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
 
@@ -63,57 +47,10 @@ 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"`.split("\n")
-        rev << git_out.first
-        if git_out.last.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
-    $version += rev
-  end
-end
-
 orig_opts = ARGV.dup
 
 opts = GetoptLong.new(
@@ -152,8 +89,13 @@ if File.directory? "#{defaultlib}/rbot"
     $:.unshift defaultlib
   end
 end
-  
+
 begin
+  # ruby 1.9 specific fixes
+  unless RUBY_VERSION < '1.9'
+    require 'rbot/compat19'
+  end
+
   require 'rbot/ircbot'
 rescue LoadError => e
   puts "Error: couldn't find the rbot/ircbot module (or one of its dependencies)\n"