combine .xinitrcs to be one

This commit is contained in:
cuu 2018-12-25 23:08:43 +08:00
parent 9acbdd48e4
commit d5020bc16a
2 changed files with 21 additions and 6 deletions

4
.cpirc
View File

@ -5,8 +5,8 @@ then
mpd ~/.mpd.conf mpd ~/.mpd.conf
if [[ $SCREEN =~ .*320.* ]] if [[ $SCREEN =~ .*320.* ]]
then then
startx /home/cpi/launchergo/.xinitrc_320 -- -nocursor > /tmp/x.log 2>&1 startx /home/cpi/launchergo/.xinitrc -- -nocursor > /tmp/x.log 2>&1
else else
startx /home/cpi/launchergo/.xinitrc > /tmp/x.log 2>&1 startx /home/cpi/launchergo/.xinitrc hdmi > /tmp/x.log 2>&1
fi fi
fi fi

View File

@ -1,4 +1,19 @@
feh --bg-center ~/launchergo/sysgo/gameshell/wallpaper/desktopbg.jpg session=${1:-gameshell}
exec ~/launchergo/load.sh &
exec ~/launcher/sys.py/gsnotify/gsnotify-arm daemon& case $session in
exec /usr/bin/twm -f ~/launchergo/.twmrc hdmi )
feh --bg-center ~/launchergo/sysgo/gameshell/wallpaper/desktopbg.jpg
exec ~/launchergo/load.sh &
exec ~/launcher/sys.py/gsnotify/gsnotify-arm daemon &
exec /usr/bin/twm -f ~/launchergo/.twmrc
;;
gameshell )
feh --bg-center ~/launchergo/sysgo/gameshell/wallpaper/loading.png
exec ~/launchergo/load.sh &
exec ~/launcher/sys.py/gsnotify/gsnotify-arm &
exec awesome -c ~/launchergo/awesome/rc.lua
;;
*)
exec $1;;
esac