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

diff --git a/channel.sh b/channel.sh
index 0f1bda7..dfa6528 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,9 +43,10 @@ nicklist(){
 
   nicklist='NICKNAMES: '
   while read -r s p nick; do
-    nicklist="${nicklist}/$nick/"
+    [ -d "/proc/$p" ] && nicklist="${nicklist}/$nick/" \
+    || sed -i -E "/^$s $p /d" "$nickfile"
   done <"$nickfile"
-  if ! tail -n20 "$chatfile" |grep -qxF "$nicklist"; then
+  if ! tail -n20 "$chatfile" |tac |grep -m1 '^NICKNAMES: ' |grep -qxF "$nicklist"; then
     printf '%s\n' "$nicklist" >>"$chatfile"
   fi
 }