diff options
| -rw-r--r-- | desktop/matchbox-window-manager/matchbox-window-manager.SlackBuild | 4 | ||||
| -rw-r--r-- | desktop/matchbox-window-manager/xinitrc.matchbox | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/desktop/matchbox-window-manager/matchbox-window-manager.SlackBuild b/desktop/matchbox-window-manager/matchbox-window-manager.SlackBuild index 8120c916ec..f56a2c80b9 100644 --- a/desktop/matchbox-window-manager/matchbox-window-manager.SlackBuild +++ b/desktop/matchbox-window-manager/matchbox-window-manager.SlackBuild @@ -24,15 +24,13 @@ PRGNAM=matchbox-window-manager VERSION=1.1 -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/matchbox-window-manager/xinitrc.matchbox b/desktop/matchbox-window-manager/xinitrc.matchbox index 64c2ea46ed..be55eda85e 100644 --- a/desktop/matchbox-window-manager/xinitrc.matchbox +++ b/desktop/matchbox-window-manager/xinitrc.matchbox @@ -2,8 +2,8 @@ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/usr/lib/X11/xinit/.Xresources -sysmodmap=/usr/lib/X11/xinit/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap # Merge in defaults and keymaps [ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources @@ -12,9 +12,14 @@ sysmodmap=/usr/lib/X11/xinit/.Xmodmap [ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap # Start Matchbox -if [ -x /usr/bin/matchbox-session ]; then - matchbox-session +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + if [ -x /usr/bin/matchbox-session ]; then + ck-launch-session matchbox-session + else + matchbox-session + fi else xterm & matchbox-window-manager fi + |