From 740340ae840eb13012d6c08dfe0f924b58eec5e3 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 3 Dec 2018 22:48:11 +0100
Subject: tv xmonad shell: prevent double yield

---
 tv/5pkgs/haskell/xmonad-tv/shell.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'tv')

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
-- 
cgit v1.2.3