Merge up from trunk. cvs up -j branchpoint-2001-10-09-tell -j mergeup-1-2001-10...

[ircbot] / bridge.tcl

diff --git a/bridge.tcl b/bridge.tcl
index f0f84f5fcf0780f21ecc5619996c651b41347e4d..64d2d5ed66de0ed3daf10740dd958bf0d3d909f0 100755 (executable)
--- a/bridge.tcl
+++ b/bridge.tcl
@@ -53,11 +53,11 @@ def_bnbot event {l} {
     global channel errorCode
     if {[regexp {^1002 JOIN ([^ ]+) \w+} $l dummy n]} {
        set bnnicks($n) 1
-       sendprivmsg $channel "[bnnick_clean $n] has joined $bnchanfn"
+       sendprivmsg $channel "[bnnick_clean $n] has joined $bnchanfn."
     } elseif {[regexp {^1003 LEAVE ([^ ]+) \w+$} $l dummy n]} {
        if {"$n" == "$bnnick"} return
        catch { unset bnnicks($n) }
-       sendprivmsg $channel "[bnnick_clean $n] has left $bnchanfn"
+       sendprivmsg $channel "[bnnick_clean $n] has left $bnchanfn."
     } elseif {[regexp {^1004 WHISPER ([^ ]+) \w+ "(.*)"$} $l dummy n text]} {
        if {[catch {
            go_usercommand "$botid $n" $bnchanfn $n $n $text
@@ -99,7 +99,7 @@ proc tellall {msg} {
 proc msg_JOIN {p c chan} {
     global onchan_nicks
     prefix_nick
-    tellall "$n has joined $chan"
+    tellall "$n has joined $chan."
     set onchan_nicks($n) 1
 }
 
@@ -108,7 +108,7 @@ proc msg_NICK {p c newnick} {
     prefix_nick
     kill_nick $n
     set onchan_nicks($newnick) 1
-    tellall "$n has changed nicks to $newnick"
+    tellall "$n has changed nicks to $newnick."
 }
 
 proc kill_nick {n} { global onchan_nicks; catch { unset onchan_nicks($n) } }
@@ -125,7 +125,7 @@ proc msg_KILL {p c user why} {
 }
 proc msg_PART {p c chan} {
     prefix_nick
-    tellall "$n has left $chan"
+    tellall "$n has left $chan."
     kill_nick $n
 }
 proc msg_QUIT {p c why} {
@@ -152,6 +152,10 @@ def_ucmd who {
     return [list $o]
 }
 
-loadhelp
-ensure_connecting
-foreach botid $bots { bnbot_ensure_connecting $botid }
+if {[catch {
+    loadhelp
+    ensure_connecting
+    foreach botid $bots { bnbot_ensure_connecting $botid }
+} emsg]} {
+    fail "startup: $emsg"
+}