summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2021-10-05 23:09:44 +0200
committertv <tv@krebsco.de>2021-10-05 23:09:44 +0200
commit1b65517b444daa190a9cb80ea85a85d49bd0d394 (patch)
tree453c07100e4b73e24aad625de0b250cec4994624
parent72d5a050e11ee59604ae8d165b3a284d2799e7e2 (diff)
irc-announce: use ircaids
-rw-r--r--krebs/5pkgs/simple/irc-announce/default.nix74
1 files changed, 11 insertions, 63 deletions
diff --git a/krebs/5pkgs/simple/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix
index 5797b3667..7b2af0307 100644
--- a/krebs/5pkgs/simple/irc-announce/default.nix
+++ b/krebs/5pkgs/simple/irc-announce/default.nix
@@ -1,18 +1,8 @@
{ pkgs, lib, ... }:
-with lib;
-
pkgs.writeDashBin "irc-announce" ''
set -euf
- export PATH=${makeSearchPath "bin" (with pkgs; [
- coreutils
- gawk
- gnused
- netcat
- nettools
- ])}
-
IRC_SERVER=$1
IRC_PORT=$2
IRC_NICK=$3_$$
@@ -20,57 +10,15 @@ pkgs.writeDashBin "irc-announce" ''
IRC_TLS=$5
message=$6
- export IRC_CHANNEL # for privmsg_cat
-
- # echo2 and cat2 are used output to both, stdout and stderr
- # This is used to see what we send to the irc server. (debug output)
- echo2() { echo "$*"; echo "$*" >&2; }
- cat2() {
- awk '{
- print $0
- print $0 > "/dev/stderr"
- }'
- }
-
- # privmsg_cat transforms stdin to a privmsg
- privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }
-
- tls_flag() { if [ "$IRC_TLS" -eq 1 ]; then echo "-c"; fi }
-
- # ircin is used to feed the output of netcat back to the "irc client"
- # so we can implement expect-like behavior with sed^_^
- # XXX mkselfdestructingtmpfifo would be nice instead of this cruft
- tmpdir=$(mktemp --tmpdir -d irc-announce_XXXXXXXX)
- cd "$tmpdir"
- mkfifo ircin
- trap "
- rm ircin
- cd '$OLDPWD'
- rmdir '$tmpdir'
- trap - EXIT INT QUIT
- " EXIT INT QUIT
-
- {
- echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)"
- echo2 "NICK $IRC_NICK"
-
- awk 'match($0, /PING(.*)/, m) {print "PONG", m[1]; exit}'
-
- # wait for MODE message
- sed -n '/^:[^ ]* MODE /q'
-
- echo2 "JOIN $IRC_CHANNEL"
-
- printf '%s' "$message" \
- | privmsg_cat \
- | cat2
-
- echo2 "PART $IRC_CHANNEL"
-
- # wait for PART confirmation
- sed -n '/:'"$IRC_NICK"'![^ ]* PART /q'
-
- echo2 'QUIT :Gone to have lunch'
- } < ircin \
- | nc $(tls_flag) "$IRC_SERVER" "$IRC_PORT" | tee -a ircin
+ if test "$IRC_TLS" != 1; then
+ unset IRC_TLS
+ fi
+
+ printf %s "$message" |
+ ${pkgs.ircaids}/bin/ircsink \
+ --nick="$IRC_NICK" \
+ --port="$IRC_PORT" \
+ --server="$IRC_SERVER" \
+ --target="$IRC_CHANNEL" \
+ ''${IRC_TLS:+--secure}
''