Merge pull request #16 from cuu/master

combine .xinitrcs to be one
This commit is contained in:
GNU 2018-12-25 23:10:40 +08:00 committed by GitHub
commit 348b69656f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 10 deletions

4
.cpirc
View File

@ -5,8 +5,8 @@ then
mpd ~/.mpd.conf
if [[ $SCREEN =~ .*320.* ]]
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
startx /home/cpi/launchergo/.xinitrc > /tmp/x.log 2>&1
startx /home/cpi/launchergo/.xinitrc hdmi > /tmp/x.log 2>&1
fi
fi

View File

@ -1,4 +1,19 @@
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
session=${1:-gameshell}
case $session in
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

View File

@ -1,4 +0,0 @@
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