merge conflict

This commit is contained in:
Dimitar Dimitrov 2013-07-17 21:08:15 +01:00
commit 8c3988b2c5

5
bot.sh
View File

@ -7,11 +7,14 @@ echo "NICK $nick" > $config
echo "USER $user" >> $config echo "USER $user" >> $config
echo "JOIN #$channel" >> $config echo "JOIN #$channel" >> $config
tail -f $config | telnet $server 6667 | while read res; do tail -f $config | telnet $server 6667 | while read res;
do
# do things when you see output
case "$res" in case "$res" in
PING*) PING*)
echo "$res" | sed "s/PING/PONG/" >> $config echo "$res" | sed "s/PING/PONG/" >> $config
;; ;;
# for pings on nick/user
*"You have not"*) *"You have not"*)
echo "JOIN #$channel" >> $config echo "JOIN #$channel" >> $config
;; ;;