From a83b1223ef01cff158c7257cfdc7f3caba288b9c Mon Sep 17 00:00:00 2001 From: Jonas Gunz Date: Sat, 25 Sep 2021 18:55:36 +0200 Subject: xinitrc: sh compatability --- .xinitrc | 6 ++++-- xinitrc.d/00-misc.sh | 0 xinitrc.d/10-mqtt-lock.sh | 0 xinitrc.d/10-screensaver.sh | 0 xinitrc.d/99-wm.sh | 0 5 files changed, 4 insertions(+), 2 deletions(-) mode change 100755 => 100644 xinitrc.d/00-misc.sh mode change 100755 => 100644 xinitrc.d/10-mqtt-lock.sh mode change 100755 => 100644 xinitrc.d/10-screensaver.sh mode change 100755 => 100644 xinitrc.d/99-wm.sh diff --git a/.xinitrc b/.xinitrc index d9f49ab..935cb33 100644 --- a/.xinitrc +++ b/.xinitrc @@ -12,9 +12,11 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then fi if [ -f ~/.files ]; then - source ~/.files + . "$HOME/.files" for f in $DOTFILEBASE/xinitrc.d/*; do - [ -x "$f" ] && . "$f" + # Some scripts require bash, but .xinitrc is sourced from sh. + # If a script is marked executable, it is executed instead of sourced. + [ -x "$f" ] && exec "$f" || . "$f" done unset f fi diff --git a/xinitrc.d/00-misc.sh b/xinitrc.d/00-misc.sh old mode 100755 new mode 100644 diff --git a/xinitrc.d/10-mqtt-lock.sh b/xinitrc.d/10-mqtt-lock.sh old mode 100755 new mode 100644 diff --git a/xinitrc.d/10-screensaver.sh b/xinitrc.d/10-screensaver.sh old mode 100755 new mode 100644 diff --git a/xinitrc.d/99-wm.sh b/xinitrc.d/99-wm.sh old mode 100755 new mode 100644 -- cgit v1.2.3