diff --git a/shbot.sh b/shbot.sh index 066d202..0deee12 100755 --- a/shbot.sh +++ b/shbot.sh @@ -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 diff --git a/shbrain.sh b/shbrain.sh index 06cad02..572bd10 100755 --- a/shbrain.sh +++ b/shbrain.sh @@ -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}