X-Git-Url: http://git.plutz.net/?p=httpchat;a=blobdiff_plain;f=channel.sh;h=a59a5a46ddced0c0b7e1daa8559eea04f25f0cd2;hp=0f1bda7ecd6cb2285c9db1522f9fbaeea43a2a1d;hb=ecef5d8df4714fb141e42842e6df2028b151e831;hpb=7dbb8789442cb924b7c3ed4d7126ef9b3173ffc5

diff --git a/channel.sh b/channel.sh
index 0f1bda7..a59a5a4 100755
--- a/channel.sh
+++ b/channel.sh
@@ -32,7 +32,7 @@ nicklist(){
   local nickfile="${chatfile%/channel}/nicks"
   case $1 in
     enter)
-      trap 'sed -i -E "/^${SESSION_KEY%%-*} $$ /d" "$nickfile"' INT QUIT
+      trap 'nicklist leave' INT QUIT
       sed -i -E "/^${SESSION_KEY%%-*} /d" "$nickfile"
       printf '%s %i %s\n' "${SESSION_KEY%%-*}" "$$" "$nickname" >>"$nickfile"
     ;;
@@ -43,7 +43,8 @@ nicklist(){
 
   nicklist='NICKNAMES: '
   while read -r s p nick; do
-    nicklist="${nicklist}/$nick/"
+    [ -d "/proc/$pid" ] && nicklist="${nicklist}/$nick/" \
+    || sed -i -E "/^$s $p /d" "$nickfile"
   done <"$nickfile"
   if ! tail -n20 "$chatfile" |grep -qxF "$nicklist"; then
     printf '%s\n' "$nicklist" >>"$chatfile"