From c6ba40466969de5107c0dbb04b47f2ecd9968d6a Mon Sep 17 00:00:00 2001 From: Quinn Date: Mon, 12 Jan 2026 12:47:35 +0100 Subject: [PATCH] don't assume what programme the file should be executed with, it may not be the same shell. --- .xinitrc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.xinitrc b/.xinitrc index 878cea7..1c82da6 100755 --- a/.xinitrc +++ b/.xinitrc @@ -1,10 +1,9 @@ #!/usr/bin/env sh -# shellcheck disable=SC1090,SC1091 # load system xinit scripts if [ -d /etc/X11/xinit/xinitrc.d ]; then for f in "/etc/X11/xinit/xinitrc.d"/?*.sh; do - . "$f" + ./"$f" done unset f fi @@ -21,10 +20,10 @@ export __GL_SYNC_TO_VBLANK=0 # disable vsync in driver, to aid with some numlockx on # ensure numlock is on before setting keymap -setxkbmap us -variant altgr-intl -option '' # load the correct keymap which actually has 3rd level shift -[ -f "/etc/xprofile" ] && . "/etc/xprofile" # load the system-wide xprofile -[ -f "$HOME/.xprofile" ] && . "$HOME/.xprofile" # load the local xprofile configuration -[ -f "$HOME/.Xmodmap" ] && xmodmap "$HOME/.Xmodmap" # load local keymap +setxkbmap us -variant altgr-intl -option '' # load the correct keymap which actually has 3rd level shift +[ -x "/etc/xprofile" ] && "/etc/xprofile" # load the system-wide xprofile +[ -x "$HOME/.xprofile" ] && "$HOME/.xprofile" # load the local xprofile configuration +[ -f "$HOME/.Xmodmap" ] && xmodmap "$HOME/.Xmodmap" # load local keymap [ -x /usr/bin/picom ] && /usr/bin/picom -b # start picom as a background service -exec i3 -c "$XDG_CONFIG_HOME/i3/config" # start the graphical environment (replaces shell) +exec i3 -c "$XDG_CONFIG_HOME/i3/config" # start the graphical environment (replaces shell)