summaryrefslogtreecommitdiff
path: root/desktop/icewm/xinitrc.icewm
diff options
context:
space:
mode:
authorRobby Workman <rw@rlworkman.net>2010-05-11 22:21:53 +0200
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-11 22:21:53 +0200
commitbc71818e74a2890d81eaaef4d4217c222a5cafee (patch)
tree93e948a04b864d0dafd0316398248f2c41422904 /desktop/icewm/xinitrc.icewm
parentf286a25d705137066da3260d6c810717e22ea7e0 (diff)
downloadslackbuilds-bc71818e74a2890d81eaaef4d4217c222a5cafee.tar.gz
desktop/icewm: Updated for version 1.2.36
Diffstat (limited to 'desktop/icewm/xinitrc.icewm')
-rw-r--r--desktop/icewm/xinitrc.icewm24
1 files changed, 6 insertions, 18 deletions
diff --git a/desktop/icewm/xinitrc.icewm b/desktop/icewm/xinitrc.icewm
index 399a04b3a2..a2fdacc78a 100644
--- a/desktop/icewm/xinitrc.icewm
+++ b/desktop/icewm/xinitrc.icewm
@@ -5,25 +5,13 @@ usermodmap=$HOME/.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/bin/xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
- /usr/bin/xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
- /usr/bin/xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
- /usr/bin/xmodmap $usermodmap
-fi
-
-# Create default user directory & populate it if not already existent
+# Create default user directory & populate it if it does not already exist
if [ ! -d $HOME/.icewm ]; then
mkdir $HOME/.icewm
for FILE in keys menu preferences toolbar winoptions;