summaryrefslogtreecommitdiff
path: root/desktop/ion
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-12-20 20:52:49 -0600
committerRobby Workman <rworkman@slackbuilds.org>2010-12-20 20:55:40 -0600
commite5a3a8a37c884e40bf0e1e2ae0dc5ddcb7713d89 (patch)
tree3295fe64d2b3ac4e852e2197091111e1049188d5 /desktop/ion
parent5a5a9760ce902eae37445f637cbf9950aa4dbecf (diff)
downloadslackbuilds-e5a3a8a37c884e40bf0e1e2ae0dc5ddcb7713d89.tar.gz
desktop/ion: Tweaks to xinitrc re consolekit usage
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/ion')
-rw-r--r--desktop/ion/ion.SlackBuild4
-rw-r--r--desktop/ion/xinitrc.ion2
2 files changed, 2 insertions, 4 deletions
diff --git a/desktop/ion/ion.SlackBuild b/desktop/ion/ion.SlackBuild
index 78db9cc92a..1c839afc65 100644
--- a/desktop/ion/ion.SlackBuild
+++ b/desktop/ion/ion.SlackBuild
@@ -8,15 +8,13 @@
PRGNAM=ion
VERSION=3_20090110
-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/ion/xinitrc.ion b/desktop/ion/xinitrc.ion
index 7c205b5d66..48a25f2892 100644
--- a/desktop/ion/xinitrc.ion
+++ b/desktop/ion/xinitrc.ion
@@ -11,7 +11,7 @@ test -f $sysmodmap && xmodmap $sysmodmap
test -f $userresources && xrdb -merge $userresources
test -f $usermodmap && xmodmap $usermodmap
-if [ -z $DESKTOP_SESSION ]; then
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
exec ck-launch-session ion3
else
exec ion3