diff options
| author |  Jonas Gunz <himself@jonasgunz.de>
| 2021-09-25 18:55:36 +0200 |
|---|---|---|
| committer | Jonas Gunz <himself@jonasgunz.de>
| 2021-09-25 18:55:36 +0200 |
| commit | a83b1223ef01cff158c7257cfdc7f3caba288b9c (patch) | |
| tree | f150dcecc49d3a2b9c9c43ad89ea8b6755e03a58 | |
| parent | 99997b71145b53c8f3ede3881ce04d80556d44ec (diff) | |
| download | dotfiles-a83b1223ef01cff158c7257cfdc7f3caba288b9c.tar.gz | |
xinitrc: sh compatability
| -rw-r--r-- | .xinitrc | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | xinitrc.d/00-misc.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | xinitrc.d/10-mqtt-lock.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | xinitrc.d/10-screensaver.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | xinitrc.d/99-wm.sh | 0 |
5 files changed, 4 insertions, 2 deletions
@@ -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 index 20e3390..20e3390 100755..100644 --- a/xinitrc.d/00-misc.sh +++ b/xinitrc.d/00-misc.sh diff --git a/xinitrc.d/10-mqtt-lock.sh b/xinitrc.d/10-mqtt-lock.sh index 8719b0b..8719b0b 100755..100644 --- a/xinitrc.d/10-mqtt-lock.sh +++ b/xinitrc.d/10-mqtt-lock.sh diff --git a/xinitrc.d/10-screensaver.sh b/xinitrc.d/10-screensaver.sh index 28e6cd2..28e6cd2 100755..100644 --- a/xinitrc.d/10-screensaver.sh +++ b/xinitrc.d/10-screensaver.sh diff --git a/xinitrc.d/99-wm.sh b/xinitrc.d/99-wm.sh index 5a83852..5a83852 100755..100644 --- a/xinitrc.d/99-wm.sh +++ b/xinitrc.d/99-wm.sh |