diff options
| author | makefu <github@syntax-fehler.de> | 2015-08-31 13:10:17 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-08-31 13:10:17 +0200 |
| commit | beca84306888be2a627ae2ab14530f853b1218ed (patch) | |
| tree | 51371b1a426312e3ddb817d97599cc05bc319a9e | |
| parent | 7eba4293714b9dce86c07ccf2fdaddaa11a4c3c7 (diff) | |
Reaktor: update deps
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | Reaktor.nix | 13 | ||||
| -rwxr-xr-x | reaktor/commands/tell-on_join | 3 | ||||
| -rw-r--r-- | reaktor/config.py | 13 |
4 files changed, 24 insertions, 6 deletions
diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..bb3ec5f --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include README.md diff --git a/Reaktor.nix b/Reaktor.nix index b804b44..0f9a2ed 100644 --- a/Reaktor.nix +++ b/Reaktor.nix @@ -1,15 +1,24 @@ with import <nixpkgs> {}; # nix-build Reaktor.nix # result/bin/reaktor +## or in your env +# nix-env -i -f Reaktor.nix buildPythonPackage rec { name = "Reaktor-${version}"; version = "0.2.6"; - propagatedBuildInputs = with pkgs.pythonPackages;[ + propagatedBuildInputs = with pkgs;[ pythonPackages.docopt + utillinux # for tell_on-join + git ]; src = fetchurl { - url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-0.2.6.tar.gz"; + url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-${version}.tar.gz"; sha256 = "1dksw1s1n2hxvnga6pygjr174dywncr0wiggkrkn1srbn2amh1c2"; }; + meta = { + homepage = http://krebsco.de/; + description = "An IRC bot based on asynchat"; + license = stdenv.lib.licenses.wtfpl; + }; } diff --git a/reaktor/commands/tell-on_join b/reaktor/commands/tell-on_join index 2dbff41..bb4982c 100755 --- a/reaktor/commands/tell-on_join +++ b/reaktor/commands/tell-on_join @@ -1,13 +1,14 @@ #! /bin/sh set -euf -# require flock from util-linux +# require flock from util-linux (pkgs.utillinux) if test "${FLOCK-}" != "$state_file"; then exec env FLOCK="$state_file" flock "$state_file" "$0" "$@" fi to="$_from" +test -e "$state_file" || touch "$state_file" # print messages sed -n '/^'"$to"' /{ s/^\([^ ]\+\) \([^ ]\+\) <\([^>]\+\)> \(.*\)/\1: \4 2-- \2, \3/p diff --git a/reaktor/config.py b/reaktor/config.py index 73daa81..8582432 100644 --- a/reaktor/config.py +++ b/reaktor/config.py @@ -10,8 +10,15 @@ debug = True name = os.environ.get('IRC_NICKNAME','crabmanner') -#workdir = expanduser('~') + '/state' -workdir = './state' +#workdir = './state' +workdir = expanduser('~') + '/state' + +# TODO: YAY more functionality in config.py .. +# if this fails the bot will fail (which is ok) +if not os.path.isdir(workdir): os.makedirs(workdir) + + + irc_alarm_timeout = 300 irc_hammer_interval = 10 @@ -36,7 +43,7 @@ config_filename = abspath(__file__) mod_dir=dirname(abspath(reaktor.__file__)) # the commands dirname ( -dist_dir = abspath(join(mod_dir,"..")) +dist_dir = abspath(join(mod_dir)) # me is used, so name cannot kill our patterns below |