mirror of
https://github.com/clockworkpi/launcher.git
synced 2025-12-12 17:58:50 +01:00
combine xinitrc to be one
This commit is contained in:
parent
95387464bd
commit
6b866f940e
4
.cpirc
4
.cpirc
@ -5,8 +5,8 @@ then
|
||||
mpd ~/.mpd.conf
|
||||
if [[ $SCREEN =~ .*320.* ]]
|
||||
then
|
||||
startx /home/cpi/launcher/.xinitrc_320 -- -nocursor > /tmp/x.log 2>&1
|
||||
startx /home/cpi/launcher/.xinitrc -- -nocursor > /tmp/x.log 2>&1
|
||||
else
|
||||
startx /home/cpi/launcher/.xinitrc > /tmp/x.log 2>&1
|
||||
startx /home/cpi/launcher/.xinitrc hdmi > /tmp/x.log 2>&1
|
||||
fi
|
||||
fi
|
||||
|
||||
23
.xinitrc
23
.xinitrc
@ -1,4 +1,19 @@
|
||||
feh --bg-center ~/launcher/sys.py/gameshell/wallpaper/desktopbg.jpg
|
||||
exec ~/launcher/load.sh &
|
||||
exec ~/launcher/sys.py/gsnotify/gsnotify-arm daemon&
|
||||
exec /usr/bin/twm -f ~/launcher/.twmrc
|
||||
session=${1:-gameshell}
|
||||
|
||||
case $session in
|
||||
hdmi )
|
||||
feh --bg-center ~/launcher/sys.py/gameshell/wallpaper/desktopbg.jpg
|
||||
exec ~/launcher/load.sh &
|
||||
exec ~/launcher/sys.py/gsnotify/gsnotify-arm daemon &
|
||||
exec /usr/bin/twm -f ~/launcher/.twmrc
|
||||
;;
|
||||
gameshell )
|
||||
feh --bg-center ~/launcher/sys.py/gameshell/wallpaper/loading.png
|
||||
exec ~/launcher/load.sh &
|
||||
exec ~/launcher/sys.py/gsnotify/gsnotify-arm &
|
||||
exec awesome -c ~/launcher/awesome/rc.lua
|
||||
;;
|
||||
*)
|
||||
exec $1;;
|
||||
esac
|
||||
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
feh --bg-center ~/launcher/sys.py/gameshell/wallpaper/loading.png
|
||||
exec ~/launcher/load.sh &
|
||||
exec ~/launcher/sys.py/gsnotify/gsnotify-arm &
|
||||
exec awesome -c ~/launcher/awesome/rc.lua
|
||||
Loading…
x
Reference in New Issue
Block a user