summaryrefslogtreecommitdiffstats
path: root/desktop/afterstep
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2010-12-20 21:27:55 -0600
committer Robby Workman <rworkman@slackbuilds.org>2010-12-20 21:27:55 -0600
commit6a74bc526f160c074acaa3e2406fbfe032e59371 (patch)
treee025810262316fc9b733d5bd2cdb1c31091b7fbe /desktop/afterstep
parentd23cc355957ce564c42def07e7deb6cd39c70301 (diff)
downloadslackbuilds-6a74bc526f160c074acaa3e2406fbfe032e59371.tar.gz
slackbuilds-6a74bc526f160c074acaa3e2406fbfe032e59371.tar.xz
desktop/afterstep: Poke consolekit in xinitrc
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/afterstep')
-rw-r--r--desktop/afterstep/afterstep.SlackBuild4
-rw-r--r--desktop/afterstep/xinitrc.afterstep6
2 files changed, 6 insertions, 4 deletions
diff --git a/desktop/afterstep/afterstep.SlackBuild b/desktop/afterstep/afterstep.SlackBuild
index d23af0437c..e71df885f6 100644
--- a/desktop/afterstep/afterstep.SlackBuild
+++ b/desktop/afterstep/afterstep.SlackBuild
@@ -5,15 +5,13 @@
PRGNAM=afterstep
VERSION=${VERSION:-2.2.9}
-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/afterstep/xinitrc.afterstep b/desktop/afterstep/xinitrc.afterstep
index 009f5b89d4..3b45c51b4a 100644
--- a/desktop/afterstep/xinitrc.afterstep
+++ b/desktop/afterstep/xinitrc.afterstep
@@ -12,5 +12,9 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
[ -f $usermodmap ] && xmodmap $usermodmap
# Start the window manager:
-exec /usr/bin/afterstep
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+ exec ck-launch-session /usr/bin/afterstep
+else
+ exec /usr/bin/afterstep
+fi