summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-02-03 11:04:26 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-02-03 11:04:26 -0500
commit36affce8463933d1124fe3f841544be4ff567b87 (patch)
tree323ec12e17394182c9949d12e7a86d8bdff1edf7
parent3a22183b721e08d0ef9b186ca13df1e05f0c2bc6 (diff)
parenta41c113539cab32ccf697219ef024735bc6fd866 (diff)
Merge branch 'master' into gluglugt60-par/master
-rwxr-xr-x.config/X11/clientrc2
-rw-r--r--.config/systemd/user/wmii@.service3
2 files changed, 2 insertions, 3 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc
index cbcf07a..9488ec8 100755
--- a/.config/X11/clientrc
+++ b/.config/X11/clientrc
@@ -19,7 +19,7 @@ fi
#exec wmii
wm=wmii
-systemctl --user start "${wm}@${DISPLAY}.service"
mkfifo "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}"
trap "rm $(printf %q "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}")" EXIT
+systemctl --user start "${wm}@${DISPLAY}.service"
cat "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}" >/dev/null
diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service
index 12f585b..3902627 100644
--- a/.config/systemd/user/wmii@.service
+++ b/.config/systemd/user/wmii@.service
@@ -7,6 +7,5 @@ Type=simple
Restart=no
Environment=DISPLAY=%I
-ExecStart=/usr/bin/bash -l -c /usr/bin/wmii
+ExecStart=/usr/bin/bash -l -c 'exec 8>${XDG_RUNTIME_DIR}/x11-wm@%I; exec /usr/bin/wmii'
ExecStop=/usr/bin/wmiir xwrite /ctl Quit
-ExecStopPost=/usr/bin/timeout .1 bash -c ": > ${XDG_RUNTIME_DIR}/x11-wm@%I"