summaryrefslogtreecommitdiff
path: root/desktop/openbox/xinitrc.openbox
diff options
context:
space:
mode:
authorChess Griffin <chess@chessgriffin.com>2010-05-11 19:43:58 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-11 19:43:58 +0200
commitdb22e1616dd08dc77ceb1ea5de68a20026e2d145 (patch)
tree671376958a5dcc04868098cff829ab169e7a1195 /desktop/openbox/xinitrc.openbox
parenta9c884b8ebc0861e799ae849bb3287fe3ecef8a5 (diff)
downloadslackbuilds-db22e1616dd08dc77ceb1ea5de68a20026e2d145.tar.gz
desktop/openbox: Updated for version 3.4.6.1
Diffstat (limited to 'desktop/openbox/xinitrc.openbox')
-rw-r--r--desktop/openbox/xinitrc.openbox19
1 files changed, 9 insertions, 10 deletions
diff --git a/desktop/openbox/xinitrc.openbox b/desktop/openbox/xinitrc.openbox
index b12c4169be..572ae8f8c0 100644
--- a/desktop/openbox/xinitrc.openbox
+++ b/desktop/openbox/xinitrc.openbox
@@ -3,33 +3,32 @@
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
-sysresources=/usr/X11R6/lib/X11/xinit/.Xresources
-sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
if [ -f $sysresources ]; then
- /usr/X11R6/bin/xrdb -merge $sysresources
+ /usr/bin/xrdb -merge $sysresources
fi
if [ -f $sysmodmap ]; then
- /usr/X11R6/bin/xmodmap $sysmodmap
+ /usr/bin/xmodmap $sysmodmap
fi
if [ -f $userresources ]; then
- /usr/X11R6/bin/xrdb -merge $userresources
+ /usr/bin/xrdb -merge $userresources
fi
if [ -f $usermodmap ]; then
- /usr/X11R6/bin/xmodmap $usermodmap
+ /usr/bin/xmodmap $usermodmap
fi
# Create default user directory & populate it if not already existent
if [ ! -d $HOME/.config/openbox ]; then
mkdir -p $HOME/.config/openbox
- for FILE in menu.xml rc.xml;
- do cat /etc/xdg/openbox/$FILE > $HOME/.config/openbox/$FILE;
- done
+ cat /etc/xdg/openbox/menu.xml > $HOME/.config/openbox/menu.xml
+ cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
fi
-exec openbox
+exec openbox-session