diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-05-16 19:41:50 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-05-16 19:41:50 +0000 |
| commit | 18eea726d9c7b158b25efa242f06c45b90f35093 (patch) | |
| tree | e502d93f2cb6226a53e0957a16643e3b84a96f32 /openbox | |
| parent | 288a45a292341e9cb8b31a55467f5f784c11e462 (diff) | |
| download | asb-18eea726d9c7b158b25efa242f06c45b90f35093.tar.gz asb-18eea726d9c7b158b25efa242f06c45b90f35093.tar.xz | |
Update to SBo standards
Diffstat (limited to 'openbox')
| -rwxr-xr-x | openbox/build/xinitrc.openbox | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/openbox/build/xinitrc.openbox b/openbox/build/xinitrc.openbox index 390eecfe..add97d8a 100755 --- a/openbox/build/xinitrc.openbox +++ b/openbox/build/xinitrc.openbox @@ -1,5 +1,5 @@ #!/bin/sh -# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ +# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap @@ -7,22 +7,21 @@ sysresources=/etc/X11/xinit/.Xresources sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps +[ -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 -if [ -f $sysresources ]; then - xrdb -merge $sysresources +# Create default user directory & populate it if not already existent +if [ ! -d $HOME/.config/openbox ]; then + mkdir -p $HOME/.config/openbox + cat /etc/xdg/openbox/menu.xml > $HOME/.config/openbox/menu.xml + cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml fi -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + exec ck-launch-session dbus-launch --exit-with-session openbox +else + exec openbox fi -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# Start the window manager: -openbox-session |