hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Robby Workman 2010-12-20 21:22:31 -06:00
parent 4b40a17caa
commit 22bb08c499
5 changed files with 30 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/openbox/openbox.SlackBuild
View File

@ -28,15 +28,13 @@
PRGNAM=openbox
VERSION=${VERSION:-3.4.11}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@ -58,7 +56,7 @@ OUTPUT=${OUTPUT:-/tmp}
KXINIT=${KXINIT:-NO}
GXINIT=${GXINIT:-NO}
DOCS="ABOUT-NLS AUTHORS CHANGELOG COMPLIANCE COPYING README"
DOCS="AUTHORS CHANGELOG COMPLIANCE COPYING README"
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"

20
desktop/openbox/xinitrc.gnome-openbox
View File

@ -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

21
desktop/openbox/xinitrc.kde-openbox
View File

@ -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
@ -32,4 +20,3 @@ if [ ! -d $HOME/.config/openbox ]; then
fi
exec openbox-kde-session

27
desktop/openbox/xinitrc.openbox
View File

@ -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
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
exec ck-launch-session openbox
else
exec openbox
fi

27
desktop/openbox/xinitrc.openbox-session
View File

@ -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