salt/home
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DSK, .xinitrc: Update

Browse Source
This commit is contained in:
Salt 2018-11-26 03:36:59 -06:00
parent f7acd26352
commit 47cb45dfde
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dsk

@ -1 +1 @@
Subproject commit 0e3990770b9ff441c0e6d77bd67d6aff4fa6027a Subproject commit 97130f8e8dbf1484f7c255b5ce02784b3b20d911

13
.xinitrc
View File

@ -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"