diff options
Diffstat (limited to 'desktop/musca/xinitrc.musca')
| -rw-r--r-- | desktop/musca/xinitrc.musca | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/desktop/musca/xinitrc.musca b/desktop/musca/xinitrc.musca index 6f928e8b21..ca388f5d12 100644 --- a/desktop/musca/xinitrc.musca +++ b/desktop/musca/xinitrc.musca @@ -7,23 +7,15 @@ sysresources=/etc/X11/xinit/.Xresources sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi +[ -f $sysresources ] && xrdb -merge $sysresources +[ -f $sysmodmap ] && xmodmap $sysmodmap +[ -f $userresources ] && xrdb -merge $userresources +[ -f $usermodmap ] && xmodmap $usermodmap # start some nice programs +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + exec ck-launch-session musca +else + exec musca +fi -musca |