DSK, .xinitrc: Update
This commit is contained in:
2
.dsk
2
.dsk
Submodule .dsk updated: 0e3990770b...97130f8e8d
13
.xinitrc
13
.xinitrc
@@ -16,19 +16,16 @@ die() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Set up our session target
|
# Set up our session target
|
||||||
command -v i3 > /dev/null 2>&1 && export STARTUP="i3"
|
|
||||||
command -v bspwm > /dev/null 2>&1 && export STARTUP="bspwm"
|
|
||||||
if [ -x "$HOME/.dsk/dsk-xinit" ]; then
|
if [ -x "$HOME/.dsk/dsk-xinit" ]; then
|
||||||
export DSK_HOME="$HOME/.dsk"
|
export DSK_HOME="$HOME/.dsk"
|
||||||
export STARTUP="$DSK_HOME/dsk-xinit"
|
export STARTUP="$DSK_HOME/dsk-xinit"
|
||||||
fi
|
fi
|
||||||
[ -z ${STARTUP+x} ] && die "No session target available"
|
[ -z "$STARTUP" ] && die "No session target available"
|
||||||
|
|
||||||
# Execute Xsession stuff
|
# Execute our target
|
||||||
[ -r /etc/X11/Xsession ] && . /etc/X11/Xsession
|
# Yes shellcheck, the rest of the code is an error handler
|
||||||
|
# shellcheck disable=2093
|
||||||
# Execute our target directly, if necessary
|
exec "$STARTUP"
|
||||||
[ -z "${STARTUP+x}" ] || exec "$STARTUP"
|
|
||||||
|
|
||||||
# If we get here, we haven't exec'd a target and must die
|
# If we get here, we haven't exec'd a target and must die
|
||||||
die "Miscellaneous error"
|
die "Miscellaneous error"
|
||||||
|
Reference in New Issue
Block a user