plugins/keywords: add method that was missing from commit 7cac523563de6473d2f93fd2d05 ...

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

diff --git a/bin/rbot b/bin/rbot
index 8e762569000eef1886ad77cbf961b893e3f7d84f..a5b7865af7f17101a1e89bf4f560a0c215b0b3a9 100755 (executable)
--- a/bin/rbot
+++ b/bin/rbot
@@ -57,30 +57,17 @@ Please note that the logfile doesn't contain IRC logs (which are located at
 # 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'
-
 $VERBOSE=true
 
 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')
-
+if $version =~ /git/
+  if defined?(SCM_DIR) and File.exists?(File.join(SCM_DIR, '.git'))
     git_out = `git status`
 
     git_out.match(/^# On branch (.*)\n/)