X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=bin%2Frbot;h=b7a6207f7e09368189aae6d4ce484704eb63654e;hb=e91f8ebc7067fd8e46b1426f6d5b66e3349c7bd2;hp=8921eeb81e93f8e67428196048f641a8dec6ec79;hpb=2a27c12fffa359898c5601a211fe19425da82fa6;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/bin/rbot b/bin/rbot
index 8921eeb8..b7a6207f 100755
--- a/bin/rbot
+++ b/bin/rbot
@@ -21,7 +21,16 @@
 # 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.
 
-$KCODE = 'u'
+# 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'
 
 $VERBOSE=true
 
@@ -32,6 +41,25 @@ require 'fileutils'
 $version="0.9.11-svn"
 $opts = Hash.new
 
+if $version =~ /svn/
+  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 =~ /^M /
+      rev << ", local changes"
+    end
+    rev << ")"
+  rescue => e
+    puts e.inspect
+  end
+  $version += rev
+end
+
 orig_opts = ARGV.dup
 
 opts = GetoptLong.new(
@@ -66,7 +94,7 @@ defaultlib = File.expand_path(File.dirname($0) + '/../lib')
 
 if File.directory? "#{defaultlib}/rbot"
   unless $:.include? defaultlib
-    $:.push defaultlib
+    $:.unshift defaultlib
   end
 end
   
@@ -93,7 +121,7 @@ if ($opts["help"])
   exit 0
 end
 
-if(bot = Irc::IrcBot.new(ARGV.shift, :argv => orig_opts))
+if(bot = Irc::Bot.new(ARGV.shift, :argv => orig_opts))
   # just run the bot
   bot.mainloop
 end