diff options
Diffstat (limited to 'system/plan9port/xinitrc.rio')
| -rw-r--r-- | system/plan9port/xinitrc.rio | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/system/plan9port/xinitrc.rio b/system/plan9port/xinitrc.rio index 20cb1751fc..5fa29b3f38 100644 --- a/system/plan9port/xinitrc.rio +++ b/system/plan9port/xinitrc.rio @@ -1,28 +1,15 @@ #!/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 - -# 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 +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# 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: exec rio |