refactor:

1 files changed, 10 insertions, 22 deletions

diff --git a/.xinitrc b/.xinitrc
index 5ace618..6160451 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -2,30 +2,18 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
+userprofile=$HOME/.xprofile
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
+sysprofile=/etc/xprofile
 
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
+[ -f $sysresources ] && xrdb -merge $sysresources
+[ -f $sysmodmap ] && xmodmap $sysmodmap
+[ -f $sysprofile ] && . $sysprofile 
+[ -f "$userresources" ] && xrdb -merge "$userresources"
+[ -f "$usermodmap" ] && xmodmap "$usermodmap"
+[ -f "$userprofile" ] && . "$userprofile" 
 
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
+[ -d /etc/X11/xinit/xinitrc.d ] && for f in /etc/X11/xinit/xinitrc.d/?*.sh; do [ -x "$f" ] && . "$f"; done
 
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-  [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-awesome
+exec awesome