From e5a3a8a37c884e40bf0e1e2ae0dc5ddcb7713d89 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Mon, 20 Dec 2010 20:52:49 -0600 Subject: desktop/ion: Tweaks to xinitrc re consolekit usage Signed-off-by: Robby Workman --- desktop/ion/ion.SlackBuild | 4 +--- desktop/ion/xinitrc.ion | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'desktop') diff --git a/desktop/ion/ion.SlackBuild b/desktop/ion/ion.SlackBuild index 78db9cc92a7a..1c839afc6546 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 7c205b5d662f..48a25f289270 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 -- cgit v1.2.3