Archived
1
0
Fork 0

Fix nickname and channel detection

* Nicknames were assumed to be in [A-Za-z] format. Just detecting
  a [^!] now as ! separates the nickname from the host.
* Channels may start with two hashes, the previous regexp didn't
  recognize that.
This commit is contained in:
Vivia Nikolaidou 2013-11-05 15:34:05 +02:00
parent d067533902
commit f5faacf250
2 changed files with 2 additions and 2 deletions

View file

@ -11,7 +11,7 @@ do
if [[ "$LINE" =~ PING\ *:(.*) ]]; then
echo "PONG :${BASH_REMATCH[1]}" >&3
else
[[ ${LINE} =~ :[a-zA-Z]*!.*(#.*)\ :.* ]] && ORIGIN=${BASH_REMATCH[1]}
[[ ${LINE} =~ :[^!]*![^#]*(#.*)\ :.* ]] && ORIGIN=${BASH_REMATCH[1]}
echo "${LINE}" | ./shbrain.sh | \
while true
do

View file

@ -8,7 +8,7 @@ do
LINE=${LINE[@]:0:$LEN}
### Parsing potential shcmd
if [[ $LINE =~ :([a-zA-Z]*)!.*:shcmd ]]; then
if [[ $LINE =~ :([^!]*)!.*:shcmd ]]; then
EXPAND=(${LINE})
CMD=${EXPAND[4]#:}
ARGS=${EXPAND[*]:5}