move the server socket to ~/irc/${server}/sock - annna - Annna the nice friendly bot.
HTML git clone git://bitreich.org/annna/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/annna/
DIR Log
DIR Files
DIR Refs
DIR Tags
DIR README
---
DIR commit 2d7a87c942313ecbb5cd5166213e73459b9d70f7
DIR parent 8e6ae12822aa4b2768b974c5acd13234689509b4
HTML Author: Josuah Demangeon <mail@josuah.net>
Date: Sun, 7 Mar 2021 23:39:04 +0100
move the server socket to ~/irc/${server}/sock
Socat does the tls to socket piping, ii does reads from a socket.
The socket bridging the two is now part of the ii hierarchy.
Signed-off-by: Annna Robert-Houdin <annna@bitreich.org>
Diffstat:
M annna-start-main | 30 ++++++++++++++++--------------
M annna-start-services | 2 +-
2 files changed, 17 insertions(+), 15 deletions(-)
---
DIR diff --git a/annna-start-main b/annna-start-main
@@ -13,34 +13,36 @@ channels="#bitreich-con #bitreich-radio
# Testing
#channels="#bitreich-radio"
+server="${1:-chat.freenode.net}"
+
rm -rf $HOME/irc
mkdir -p $HOME/irc
cd $HOME/irc
-rm -f $HOME/freenode.sock
+rm -f "$HOME/irc/${server}/sock"
# Connect
-socat openssl:chat.freenode.net:6697,keepalive,keepcnt=5,keepidle=1,keepintvl=1 \
- unix-l:$HOME/freenode.sock &
-while [ ! -e $HOME/freenode.sock ];
+socat openssl:${server}:6697,keepalive,keepcnt=5,keepidle=1,keepintvl=1 \
+ unix-l:$HOME/irc/${server}/sock &
+while [ ! -e $HOME/irc/${server}sock ];
do
[ -z "$(pgrep socat)" ] && exit 1
sleep 0.5
done
# Connection
-ii -s chat.freenode.net -u $HOME/freenode.sock -n annna \
+ii -s "$server" -u $HOME/${server}/sock -n annna \
-f "Annna Robert-Houdin" &
## Waiting for the socket to be available.
-while [ ! -e $HOME/irc/chat.freenode.net/out ];
+while [ ! -e $HOME/irc/${server}/out ];
do
sleep 0.5
done
## Waiting for the motd to have ended so we can send something.
-while [ -z "$(grep "End of /MOTD command" $HOME/irc/chat.freenode.net/out)" ];
+while [ -z "$(grep "End of /MOTD command" $HOME/irc/${server}/out)" ];
do
- if [ -n "$(grep "Nickname is already in use" $HOME/irc/chat.freenode.net/out)" ];
+ if [ -n "$(grep "Nickname is already in use" $HOME/irc/${server}/out)" ];
then
exit 1
fi
@@ -54,17 +56,17 @@ sleep 2
ircuser="$(grep user $HOME/irc-credentials.txt | cut -d' ' -f 2)"
ircpass="$(grep pass $HOME/irc-credentials.txt | cut -d' ' -f 2)"
printf "/privmsg nickserv :identify %s %s\n" "${ircuser}" "${ircpass}" \
- > chat.freenode.net/in
+ > ${server}/in
## Check that nickserv is there.
-while [ ! -e $HOME/irc/chat.freenode.net/nickserv/out ];
+while [ ! -e $HOME/irc/${server}/nickserv/out ];
do
sleep 0.5
done
## Waiting for us to be authenticated.
while [ -z "$(grep "You are now identified for" \
- $HOME/irc/chat.freenode.net/nickserv/out)" ];
+ $HOME/irc/${server}/nickserv/out)" ];
do
sleep 0.5
done
@@ -73,20 +75,20 @@ done
# Channels
for chan in ${channels};
do
- printf "/j %s\n" "${chan}" > chat.freenode.net/in
+ printf "/j %s\n" "${chan}" > ${server}/in
# Do not flood.
sleep 1
## Make sure the pipes are there.
- while [ ! -e "$HOME/irc/chat.freenode.net/${chan}/out" ];
+ while [ ! -e "$HOME/irc/${server}/${chan}/out" ];
do
sleep 0.5
done
## Make sure we are in the channel, for the services.
while [ -z "$(grep "${chan} End of /NAMES list" \
- $HOME/irc/chat.freenode.net/out)" ];
+ $HOME/irc/${server}/out)" ];
do
sleep 0.5
done
DIR diff --git a/annna-start-services b/annna-start-services
@@ -14,7 +14,7 @@ brmembers="__20h__ Evil_Bob chripo posativ quinq stateless solene josuah parazyd
botname="annna"
iiroot="/home/annna/irc"
-iibase="/home/annna/irc/chat.freenode.net"
+iibase="/home/annna/irc/${server}"
modbase="/home/annna/bin/modules/"
hashtagfile="${modbase}/hashtags/hashtags.txt"
printnhashtags=2