diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-09-19 15:49:29 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-09-19 15:49:29 -0400 |
| commit | 118f849aed5aef3bf2750ca102007b4a38e44486 (patch) | |
| tree | 47eb202ab5e4ed21a43122a44ed331e76a7bf258 /.config/X11/clientrc | |
| parent | 739fa0ff2b7b0581b2d294f8de8b9e79234ed66c (diff) | |
| parent | 641fc49fc651b6a67fb8ff90198e889e0e3920bb (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
# Conflicts:
# .config/X11/clientrc
# .config/bash/rc.sh
# .config/cron/make-config
# .config/emacs/custom.el
# .config/emacs/init.el
# .config/login.d/10_selected-editor.sh
# .config/login.sh
Diffstat (limited to '.config/X11/clientrc')
| -rw-r--r--[-rwxr-xr-x] | .config/X11/clientrc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc index 1ad935f..8bced30 100755..100644 --- a/.config/X11/clientrc +++ b/.config/X11/clientrc @@ -1,4 +1,4 @@ -#!/bin/sh +#!/hint/sh # Load system xinit modules (disabled) # Remove "false &&" to enable @@ -19,9 +19,11 @@ fi exec mate-session -trap "rm -f $(printf '%q' "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}")" EXIT -mkfifo "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}" +[ -n "$XDG_RUNTIME_DIR" ] || exit 1 +_DISPLAY="$(systemd-escape -- "$DISPLAY")" +trap "rm -f $(printf '%q' "${XDG_RUNTIME_DIR}/x11-wm@${_DISPLAY}")" EXIT +mkfifo "${XDG_RUNTIME_DIR}/x11-wm@${_DISPLAY}" -cat "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}" & -systemctl --user start "wm@${DISPLAY}.target" & +cat "${XDG_RUNTIME_DIR}/x11-wm@${_DISPLAY}" & +systemctl --user start "wm@${_DISPLAY}.target" & wait |