Merge pull request #30 from ruby-rbot/dependabot/bundler/nokogiri-1.10.9

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

diff --git a/bin/rbot b/bin/rbot
index 89c8688de2e179f3f062ec5a2c2fa5b26919faac..a8dd39c4c279a07fec80e7a7cc8621f03e464244 100755 (executable)
--- a/bin/rbot
+++ b/bin/rbot
@@ -41,64 +41,14 @@ Please note that the logfile doesn't contain IRC logs (which are located at
 #
 # This is free software, see COPYING for licensing details
 
-$VERBOSE=true
-
 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 +87,10 @@ if File.directory? "#{defaultlib}/rbot"
     $:.unshift defaultlib
   end
 end
-  
+
 begin
+  Encoding.default_internal = Encoding::UTF_8
+  Encoding.default_external = Encoding::UTF_8
   require 'rbot/ircbot'
 rescue LoadError => e
   puts "Error: couldn't find the rbot/ircbot module (or one of its dependencies)\n"