diff options
author | lassulus <lass@aidsballs.de> | 2015-10-08 17:00:19 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2015-10-08 17:00:19 +0200 |
commit | ef85f86f8ad113a3e01e16952a844fb16f810f7e (patch) | |
tree | 2a2faddc28117ffccb3c27628f2fd8d5caacd668 | |
parent | 892c99706a1c997ae064e443c2162a5659b8a05e (diff) | |
parent | 5f5c1f5f661a2c4236fb62bc4c0ec7d43ae7a5b1 (diff) |
Merge remote-tracking branch 'pnp/master'
-rw-r--r-- | makefu/1systems/pnp.nix | 3 | ||||
-rw-r--r-- | makefu/2configs/Reaktor/shack-correct.nix | 20 | ||||
-rw-r--r-- | makefu/2configs/Reaktor/shack-correct.sh | 6 |
3 files changed, 28 insertions, 1 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index fdc2f0135..e7ceca60d 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -25,6 +25,7 @@ ../2configs/Reaktor/simpleExtend.nix ../2configs/Reaktor/random-emoji.nix ../2configs/Reaktor/titlebot.nix + ../2configs/Reaktor/shack-correct.nix ../2configs/exim-retiolum.nix ../2configs/urlwatch.nix @@ -35,7 +36,7 @@ krebs.Reaktor.debug = true; krebs.Reaktor.nickname = "Reaktor|bot"; krebs.Reaktor.extraEnviron = { - REAKTOR_CHANNELS = "#krebs,#binaergewitter"; + REAKTOR_CHANNELS = "#krebs,#binaergewitter,#shackspace"; }; krebs.build.host = config.krebs.hosts.pnp; diff --git a/makefu/2configs/Reaktor/shack-correct.nix b/makefu/2configs/Reaktor/shack-correct.nix new file mode 100644 index 000000000..8f30807f1 --- /dev/null +++ b/makefu/2configs/Reaktor/shack-correct.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: + +with pkgs; +let + script = pkgs.substituteAll ( { + name="shack-correct"; + isExecutable=true; + dir = ""; + src = ./shack-correct.sh; + }); +in { + krebs.Reaktor.extraConfig = '' + public_commands.insert(0,{ + 'capname' : "shack-correct", + 'pattern' : '^(?P<args>.*Shack.*)$$', + 'argv' : ["${script}"], + 'env' : { }}) + ''; +} + diff --git a/makefu/2configs/Reaktor/shack-correct.sh b/makefu/2configs/Reaktor/shack-correct.sh new file mode 100644 index 000000000..3b4d04f80 --- /dev/null +++ b/makefu/2configs/Reaktor/shack-correct.sh @@ -0,0 +1,6 @@ +#! /bin/sh +set -eu +printf "Sie meinten wohl \"" +echo -n $@ | sed 's/Shack/shack/g' +echo "\"" +echo "${_from}--" |