aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-12-20 20:54:24 -0600
committerRobby Workman <rworkman@slackbuilds.org>2010-12-20 20:54:24 -0600
commit86abf5e435261720ad15bdf57c6fdea304416b40 (patch)
treeff91a9daa8ba966c08435cdc8d105b6350123c61
parentf079753e6d81da269e371173d7c1c69f4ad1fc88 (diff)
desktop/ratpoison: Poke consolekit in xinitrc
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--desktop/ratpoison/ratpoison.SlackBuild4
-rw-r--r--desktop/ratpoison/xinitrc.ratpoison6
2 files changed, 6 insertions, 4 deletions
diff --git a/desktop/ratpoison/ratpoison.SlackBuild b/desktop/ratpoison/ratpoison.SlackBuild
index 12eed1eaaf1b5..5525fa14d9ee5 100644
--- a/desktop/ratpoison/ratpoison.SlackBuild
+++ b/desktop/ratpoison/ratpoison.SlackBuild
@@ -5,15 +5,13 @@
PRGNAM=ratpoison
VERSION=${VERSION:-1.4.5}
-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
diff --git a/desktop/ratpoison/xinitrc.ratpoison b/desktop/ratpoison/xinitrc.ratpoison
index 4f0406439e8f0..da0c3726d7249 100644
--- a/desktop/ratpoison/xinitrc.ratpoison
+++ b/desktop/ratpoison/xinitrc.ratpoison
@@ -12,5 +12,9 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
[ -f $userresources ] && xrdb -merge $userresources
[ -f $usermodmap ] && xmodmap $usermodmap
-exec ratpoison
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+ exec ck-launch-session ratpoison
+else
+ exec ratpoison
+fi