diff options
| author |   Daniel de Kok <danieldk@pobox.com> | 2010-05-13 00:22:52 +0200 |
|---|---|---|
| committer |   Michiel van Wessem <michiel@slackbuilds.org> | 2010-05-13 00:22:52 +0200 |
| commit | e9c902a0bacad18483702597efeaf309e2ea5ed3 (patch) | |
| tree | e8c7e4712ec221b64d69f8e596a4257bfe00fb89 /desktop/matchbox-window-manager/xinitrc.matchbox | |
| parent | 4fe08c2c369845698ad04e024720c6a8c75ff21b (diff) | |
| download | slackbuilds-e9c902a0bacad18483702597efeaf309e2ea5ed3.tar.gz slackbuilds-e9c902a0bacad18483702597efeaf309e2ea5ed3.tar.xz | |
desktop/matchbox-window-manager: Updated for version 1.1
Diffstat (limited to 'desktop/matchbox-window-manager/xinitrc.matchbox')
| -rw-r--r-- | desktop/matchbox-window-manager/xinitrc.matchbox | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/desktop/matchbox-window-manager/xinitrc.matchbox b/desktop/matchbox-window-manager/xinitrc.matchbox index 29f84e56da..64c2ea46ed 100644 --- a/desktop/matchbox-window-manager/xinitrc.matchbox +++ b/desktop/matchbox-window-manager/xinitrc.matchbox @@ -1,33 +1,20 @@ #!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/usr/X11R6/lib/X11/xinit/.Xresources -sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap +sysresources=/usr/lib/X11/xinit/.Xresources +sysmodmap=/usr/lib/X11/xinit/.Xmodmap -# merge in defaults and keymaps +# Merge in defaults and keymaps +[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources +[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap +[ -f $userresources ] && /usr/bin/xrdb -merge $userresources +[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap -if [ -f $sysresources ]; then - /usr/X11R6/bin/xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - /usr/X11R6/bin/xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - /usr/X11R6/bin/xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - /usr/X11R6/bin/xmodmap $usermodmap -fi - -# start Matchbox +# Start Matchbox if [ -x /usr/bin/matchbox-session ]; then - matchbox-session + matchbox-session else - xterm & - matchbox-window-manager + xterm & + matchbox-window-manager fi |