X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=06e6db306dc4b22699f0d2191604280818b82228;hb=47eba1a679d626a94f811accf4a60a5eebc28498;hp=89c8688de2e179f3f062ec5a2c2fa5b26919faac;hpb=b3300cabeda816b79a592c3e7704abbbd3b5505c;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index 89c8688d..06e6db30 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -47,58 +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%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
-    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(
@@ -137,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"