summaryrefslogtreecommitdiff
path: root/desktop/musca
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-12-20 21:29:56 -0600
committerRobby Workman <rworkman@slackbuilds.org>2010-12-20 21:29:56 -0600
commit53697978e5554038726807783a024d586284f8b2 (patch)
treeda34f18cef430956694126cee73ba4be1fba34ae /desktop/musca
parent6a74bc526f160c074acaa3e2406fbfe032e59371 (diff)
downloadslackbuilds-53697978e5554038726807783a024d586284f8b2.tar.gz
desktop/musca: Poke consolekit in xinitrc
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/musca')
-rw-r--r--desktop/musca/musca.SlackBuild4
-rw-r--r--desktop/musca/xinitrc.musca26
2 files changed, 10 insertions, 20 deletions
diff --git a/desktop/musca/musca.SlackBuild b/desktop/musca/musca.SlackBuild
index da3c36f192..01033e57a7 100644
--- a/desktop/musca/musca.SlackBuild
+++ b/desktop/musca/musca.SlackBuild
@@ -32,15 +32,13 @@
PRGNAM=musca
VERSION=${VERSION:-0.9.24}
-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/musca/xinitrc.musca b/desktop/musca/xinitrc.musca
index 6f928e8b21..ca388f5d12 100644
--- a/desktop/musca/xinitrc.musca
+++ b/desktop/musca/xinitrc.musca
@@ -7,23 +7,15 @@ sysresources=/etc/X11/xinit/.Xresources
sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
- xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
- xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
- xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
- xmodmap $usermodmap
-fi
+[ -f $sysresources ] && xrdb -merge $sysresources
+[ -f $sysmodmap ] && xmodmap $sysmodmap
+[ -f $userresources ] && xrdb -merge $userresources
+[ -f $usermodmap ] && xmodmap $usermodmap
# start some nice programs
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+ exec ck-launch-session musca
+else
+ exec musca
+fi
-musca