diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-12-20 21:22:31 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-12-20 21:22:31 -0600 |
| commit | 22bb08c499e1b9bd148c1af2814b268aa3371be1 (patch) | |
| tree | 6c7a41ba5a2f634605b4fec100fb3065e28c5740 /desktop/openbox/xinitrc.openbox-session | |
| parent | 4b40a17caa7c0419007ad1150d667bfb00f25b00 (diff) | |
desktop/openbox: Poke consolekit in xinitrc
This commit includes a few other minor (mostly aesthetic)
tweaks to the xinitrc files.
Also note that I did not use ck-launch-session in the
kde- and gnome-specific xinitrc files; that's because
the kde/gnome session manager should have already taken
care of the needed bits in those cases.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/openbox/xinitrc.openbox-session')
| -rw-r--r-- | desktop/openbox/xinitrc.openbox-session | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/desktop/openbox/xinitrc.openbox-session b/desktop/openbox/xinitrc.openbox-session index 572ae8f8c085..007e979b7760 100644 --- a/desktop/openbox/xinitrc.openbox-session +++ b/desktop/openbox/xinitrc.openbox-session @@ -7,22 +7,10 @@ sysresources=/etc/X11/xinit/.Xresources sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps - -if [ -f $sysresources ]; then - /usr/bin/xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - /usr/bin/xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - /usr/bin/xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - /usr/bin/xmodmap $usermodmap -fi +[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources +[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap +[ -f $userresources ] && /usr/bin/xrdb -merge $userresources +[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap # Create default user directory & populate it if not already existent if [ ! -d $HOME/.config/openbox ]; then @@ -31,4 +19,9 @@ if [ ! -d $HOME/.config/openbox ]; then cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml fi -exec openbox-session +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + exec ck-launch-session openbox-session +else + exec openbox-session +fi + |