diff options
| author | Antonio Hernández Blas <hba.nihilismus@gmail.com> | 2010-05-13 00:23:28 +0200 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-13 00:23:28 +0200 |
| commit | 821a7ad35c312be274e3dca3316e1cb8f8d42789 (patch) | |
| tree | fbfa54a29124194a38167964ff6e541db1c24abf /desktop/wmii/xinitrc.wmii | |
| parent | b1458525dcc4ce8c9310ef8ad84a3e5c04431215 (diff) | |
desktop/wmii: Updated for version 3.6
Diffstat (limited to 'desktop/wmii/xinitrc.wmii')
| -rw-r--r-- | desktop/wmii/xinitrc.wmii | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/desktop/wmii/xinitrc.wmii b/desktop/wmii/xinitrc.wmii index 8d6372a83972c..81387b8890488 100644 --- a/desktop/wmii/xinitrc.wmii +++ b/desktop/wmii/xinitrc.wmii @@ -1,30 +1,18 @@ #!/bin/sh -# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ 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 - -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 +# Merge in defaults and keymaps +[ -f $sysresources ] && xrdb -merge $sysresources +[ -f $sysmodmap ] && xmodmap $sysmodmap +[ -f $userresources ] && xrdb -merge $userresources +[ -f $usermodmap ] && xmodmap $usermodmap # Start the window manager: until wmii; do true done + |