 |
Fix annna with josuah's new changes. - annna - Annna the nice friendly bot. |
 |
git clone git://bitreich.org/annna/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws6… |
 |
Log |
|
Files |
|
Refs |
|
Tags |
|
README |
|
--- |
|
commit 7ebb34ea7201a45f44d574a34b40ec6f6027393e |
|
parent 83eeabd6c50eb0aad3268583c1d5a3efa6075113 |
|
Author: Annna Robert-Houdin <[email protected]> |
|
Date: Tue, 9 Mar 2021 23:13:01 +0100 |
|
|
|
Fix annna with josuah's new changes. |
|
|
|
Diffstat: |
|
M annna-alive | 2 +- |
|
M annna-channel-service | 0 |
|
M annna-start-main | 22 +++++++++++----------- |
|
M annna-start-services | 3 +++ |
|
|
|
4 files changed, 15 insertions(+), 12 deletions(-) |
|
--- |
|
diff --git a/annna-alive b/annna-alive |
|
@@ -7,6 +7,6 @@ |
|
# |
|
|
|
|
|
-[ -z "$(pgrep -U annna -x socat)" ] && exit 1 |
|
+[ -z "$(pgrep -U annna -x ii)" ] && exit 1 |
|
exit 0 |
|
|
|
diff --git a/annna-channel-service b/annna-channel-service |
|
diff --git a/annna-start-main b/annna-start-main |
|
@@ -1,7 +1,5 @@ |
|
#!/bin/sh |
|
|
|
-set -x |
|
- |
|
export PATH="$PATH:/home/annna/bin" |
|
|
|
# #bitreich is a forward to #bitreich-en. Annna does not need to join it. |
|
@@ -13,33 +11,35 @@ channels="#bitreich-con #bitreich-radio |
|
#bitreich-nl #bitreich-lawn #bitreich-it |
|
#bitreich-tv #bitreich-meme" |
|
# Testing |
|
-#channels="#bitreich-radio" |
|
+#channels="#bitreich-scm" |
|
|
|
server="${1:-chat.freenode.net}" |
|
|
|
-rm -rf $HOME/irc |
|
-mkdir -p $HOME/irc |
|
+rm -rf $HOME/irc/${server}/out |
|
+mkdir -p $HOME/irc/${server} |
|
cd $HOME/irc |
|
rm -f "$HOME/irc/${server}/sock" |
|
|
|
# Connect |
|
#socat openssl:${server}:6697,keepalive,keepcnt=5,keepidle=1,keepintvl=1 \ |
|
# unix-l:$HOME/irc/${server}/sock & |
|
-#while [ ! -e $HOME/irc/${server}sock ]; |
|
+#while [ ! -e $HOME/irc/${server}/sock ]; |
|
#do |
|
# [ -z "$(pgrep socat)" ] && exit 1 |
|
# sleep 0.5 |
|
#done |
|
|
|
# Connection |
|
-export ircuser="$(sed -n 's/^user //p' $HOME/annna/${server}/irc-credentials.t… |
|
-export ircpass="$(sed -n 's/^pass //p' $HOME/annna/${server}/irc-credentials.t… |
|
-ii -s "${server}" -t -s "${server}" -p 6697 -n "$ircuser" -k ircpass \ |
|
+export ircuser="$(sed -n 's/^user: //p' $HOME/irc/${server}/irc-credentials.tx… |
|
+export ircpass="$(sed -n 's/^pass: //p' $HOME/irc/${server}/irc-credentials.tx… |
|
+ii -s "${server}" -t -p 6697 -n "$ircuser" -k ircpass \ |
|
-f "Annna Robert-Houdin" & |
|
+iipid=$! |
|
|
|
## Waiting for the socket to be available. |
|
while [ ! -e $HOME/irc/${server}/out ]; |
|
do |
|
+ kill -0 $iipid >/dev/null 2>&1 || exit 1 |
|
sleep 0.5 |
|
done |
|
|
|
@@ -71,8 +71,8 @@ do |
|
done |
|
|
|
## Make sure we are in the channel, for the services. |
|
- while [ -z "$(grep "${chan} End of /NAMES list" \ |
|
- $HOME/irc/${server}/out)" ]; |
|
+ while [ -z "$(grep "has joined ${chan}" \ |
|
+ $HOME/irc/${server}/${chan}/out)" ]; |
|
do |
|
sleep 0.5 |
|
done |
|
diff --git a/annna-start-services b/annna-start-services |
|
@@ -11,9 +11,12 @@ export PATH="$PATH:/opt/plan9/bin" |
|
# Bitreich members who are allowed to run certain commands. |
|
brmembers="__20h__ Evil_Bob chripo posativ quinq stateless solene josuah paraz… |
|
|
|
+server="chat.freenode.net" |
|
iiroot="/home/annna/irc" |
|
iibase="/home/annna/irc/${server}" |
|
channel_list="#bitreich-en #bitreich-fr #bitreich-de #bitreich-nl #bitreich-it… |
|
+#testing |
|
+#channel_list="#bitreich-scm" |
|
|
|
# Permissions |
|
[ -d ${iiroot} ] && chmod o+rx ${iiroot} |
