summaryrefslogtreecommitdiffstats
path: root/desktop/pekwm/xinitrc.pekwm
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/pekwm/xinitrc.pekwm')
-rw-r--r--desktop/pekwm/xinitrc.pekwm21
1 files changed, 4 insertions, 17 deletions
diff --git a/desktop/pekwm/xinitrc.pekwm b/desktop/pekwm/xinitrc.pekwm
index 8337e08883..d3109b5b69 100644
--- a/desktop/pekwm/xinitrc.pekwm
+++ b/desktop/pekwm/xinitrc.pekwm
@@ -6,22 +6,10 @@ 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 ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
# Start the window manager:
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
@@ -29,4 +17,3 @@ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
else
exec /usr/bin/pekwm
fi
-