diff options
| author | jeschli <jeschli@gmail.com> | 2018-12-16 20:28:28 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-12-16 20:28:28 +0100 |
| commit | fc0939ecf9263a778d44e1e2afb9cb118eaaa15a (patch) | |
| tree | 118cea2301540ea623c9042138a950b6cc480027 /tv/5pkgs/haskell | |
| parent | 8ecc3901fd8bbd6172e6c32325aa3bc566c388de (diff) | |
| parent | 6cf1d25e454141eda7fd59f1a9cc4564250d13ad (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'tv/5pkgs/haskell')
| -rw-r--r-- | tv/5pkgs/haskell/xmonad-tv/shell.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tv/5pkgs/haskell/xmonad-tv/shell.nix b/tv/5pkgs/haskell/xmonad-tv/shell.nix index 936e696..6ca00bc 100644 --- a/tv/5pkgs/haskell/xmonad-tv/shell.nix +++ b/tv/5pkgs/haskell/xmonad-tv/shell.nix @@ -46,7 +46,7 @@ in xmonad_restart() {( set -efu cd "$WORKDIR" - if systemctl is-active xmonad; then + if systemctl --quiet is-active xmonad; then sudo systemctl stop xmonad cp -b "$config_XMONAD_CACHE_DIR"/xmonad.state "$CACHEDIR"/ echo "xmonad.state: $(cat "$CACHEDIR"/xmonad.state)" @@ -59,9 +59,14 @@ in xmonad_yield() {( set -efu - "$xmonad" --shutdown - cp -b "$CACHEDIR"/xmonad.state "$config_XMONAD_CACHE_DIR"/ - sudo systemctl start xmonad + if ! systemctl --quiet is-active xmonad; then + "$xmonad" --shutdown + cp -b "$CACHEDIR"/xmonad.state "$config_XMONAD_CACHE_DIR"/ + sudo systemctl start xmonad + else + echo "xmonad.service is already running" >&2 + exit -1 + fi )} export PATH=${config.systemd.services.xmonad.path}:$PATH |