From 18eea726d9c7b158b25efa242f06c45b90f35093 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 16 May 2013 19:41:50 +0000
Subject: Update to SBo standards

---
 openbox/build/xinitrc.openbox | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'openbox/build')

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
-- 
cgit v1.2.3-65-gdbad