From 22bb08c499e1b9bd148c1af2814b268aa3371be1 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Mon, 20 Dec 2010 21:22:31 -0600 Subject: [PATCH] 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 --- desktop/openbox/openbox.SlackBuild | 6 ++---- desktop/openbox/xinitrc.gnome-openbox | 20 ++++-------------- desktop/openbox/xinitrc.kde-openbox | 21 ++++--------------- desktop/openbox/xinitrc.openbox | 27 +++++++++---------------- desktop/openbox/xinitrc.openbox-session | 27 +++++++++---------------- 5 files changed, 30 insertions(+), 71 deletions(-) diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild index ff1e76495f..cbfeacbca8 100644 --- a/desktop/openbox/openbox.SlackBuild +++ b/desktop/openbox/openbox.SlackBuild @@ -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" diff --git a/desktop/openbox/xinitrc.gnome-openbox b/desktop/openbox/xinitrc.gnome-openbox index 3b64b77e1a..ae9cbb511f 100644 --- a/desktop/openbox/xinitrc.gnome-openbox +++ b/desktop/openbox/xinitrc.gnome-openbox @@ -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 diff --git a/desktop/openbox/xinitrc.kde-openbox b/desktop/openbox/xinitrc.kde-openbox index 69dc360e00..22ffc0fba2 100644 --- a/desktop/openbox/xinitrc.kde-openbox +++ b/desktop/openbox/xinitrc.kde-openbox @@ -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 - diff --git a/desktop/openbox/xinitrc.openbox b/desktop/openbox/xinitrc.openbox index 483649b650..4ab1df40b6 100644 --- a/desktop/openbox/xinitrc.openbox +++ b/desktop/openbox/xinitrc.openbox @@ -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 + diff --git a/desktop/openbox/xinitrc.openbox-session b/desktop/openbox/xinitrc.openbox-session index 572ae8f8c0..007e979b77 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 +