summaryrefslogtreecommitdiff
path: root/desktop/ratpoison/xinitrc.ratpoison
diff options
context:
space:
mode:
authorGrigorios Bouzakis <grbzks@xsmail.com>2010-05-13 00:23:07 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-13 00:23:07 +0200
commit555bf07141de318f9cafb2baf0e2f0688b259f45 (patch)
tree7c873708eb0a3e773e5201db78503da210a1f2f8 /desktop/ratpoison/xinitrc.ratpoison
parent5898152d34b7b0840b8939a05562159cc3483f8b (diff)
downloadslackbuilds-555bf07141de318f9cafb2baf0e2f0688b259f45.tar.gz
desktop/ratpoison: Updated for version 1.4.5
Diffstat (limited to 'desktop/ratpoison/xinitrc.ratpoison')
-rw-r--r--desktop/ratpoison/xinitrc.ratpoison27
1 files changed, 7 insertions, 20 deletions
diff --git a/desktop/ratpoison/xinitrc.ratpoison b/desktop/ratpoison/xinitrc.ratpoison
index fb4393a7fa..4f0406439e 100644
--- a/desktop/ratpoison/xinitrc.ratpoison
+++ b/desktop/ratpoison/xinitrc.ratpoison
@@ -1,29 +1,16 @@
#!/bin/sh
-# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld 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
- /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 some nice programs
+[ -f $sysresources ] && xrdb -merge $sysresources
+[ -f $sysmodmap ] && xmodmap $sysmodmap
+[ -f $userresources ] && xrdb -merge $userresources
+[ -f $usermodmap ] && xmodmap $usermodmap
exec ratpoison
+