From 6eb7f1cb8aed0c269042f0757d81f67cc473a925 Mon Sep 17 00:00:00 2001
From: Pavel Safronov <pv.safronov@gmail.com>
Date: Sun, 20 Oct 2024 12:32:46 +0100
Subject: [PATCH] fix notification daemons race in sway

---
 .config/sway/config                 | 2 ++
 .config/sway/scripts/log_wrapper.sh | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.config/sway/config b/.config/sway/config
index a8f8455..aec4081 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -21,6 +21,8 @@ exec_always pkill -f window-bound-layout
 exec_always $log ${HOME}/.config/sway/scripts/window-bound-layout.sh
 
 exec_always pkill -f dunst
+# xfce4-notifyd is started by dbus by default causing a race condition
+exec_always $log systemctl --user stop xfce4-notifyd
 exec_always $log dunst -layer overlay -config ${HOME}/.dunstrc
 
 exec_always {
diff --git a/.config/sway/scripts/log_wrapper.sh b/.config/sway/scripts/log_wrapper.sh
index 22a43cf..d992cac 100755
--- a/.config/sway/scripts/log_wrapper.sh
+++ b/.config/sway/scripts/log_wrapper.sh
@@ -1,14 +1,14 @@
 #!/bin/sh -ue
 
 COMMAND=$(printf ' %q' "$@")
-_NAME=$(basename $1)
+_NAME=$(basename "$1")
 APP=${_NAME%.*}
 
 USER_TMP_DIR="/run/user/$(id -u)/sway_log"
-mkdir -p ${USER_TMP_DIR}
+mkdir -p "${USER_TMP_DIR}"
 
 LOG=${USER_TMP_DIR}/${APP}.log
 
 echo "[log_wrapper] Running ${COMMAND}, output log to ${LOG}"
 
-sh -c "${COMMAND}" >> ${LOG} 2>&1 || echo "[log_wrapper] App terminated ${COMMAND}, see log ${LOG}"
+sh -xc "${COMMAND}" >> "${LOG}" 2>&1 || echo "[log_wrapper] App terminated ${COMMAND}, see log ${LOG}"