Update and minor changes to upgrade script

home/.xinitrc

@@ -1,28 +1,45 @@
 #!/bin/sh
 #
 # ~/.xinitrc
-# Executed by startx 
+# Executed by startx
 # By calling this with arguments we can start different sessions
 # eg. startx ~/.xinitrc i3  or  startx ~/.xinitrc bspwm
 # simply using startx, openbox is set as the default
 
 session=${1:-openbox}
+export WM="$session"
+export XDG_CONFIG_HOME="$HOME/.config"
+export PATH=/home/smoke/bin:/usr/sbin:$PATH
 
-# source files in /etc/X11/xinit/xinitrc.d
+
+if [ -f /etc/X11/xinit/.Xmodmap ]; then
+    xmodmap /etc/X11/xinit/.Xmodmap
+fi
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
-    for f in /etc/X11/xinit/xinitrc.d/*; do
+    for f in /etc/X11/xinit/xinitrc.d/*.sh; do
         [ -x "$f" ] && . "$f"
     done
-    unset f
 fi
 
-# this must be before the 'exec' command
-# it sources ~/.xprofile for additional settings
-[ -f ~/.xprofile ] && . ~/.xprofile
+if [ -f ~/.Xresources ]; then
+    xrdb -load ~/.Xresources
+fi
+if [ -f ~/.Xmodmap ]; then
+    xmodmap ~/.Xmodmap
+fi
+if [ -f ~/.xprofile ]; then
+    . ~/.xprofile
+fi
+
+gnome-keyring-daemon --start --components=pkcs11 &
+lxpolkit &
+kbdrate -d 400 -r 50
+xset r rate 400 50
+xset s 3600 3600
 
 # start the session
 case $session in
-    i3|i3wm) 
+    i3|i3wm)
         exec i3
         ;;
     bsp|bspwm)
@@ -31,13 +48,12 @@ case $session in
     awesome)
         exec awesome
         ;;
-    xfce|xfce4) 
+    xfce|xfce4)
         exec startxfce4
         ;;
-    openbox|openbox-session) 
+    openbox|openbox-session)
         exec openbox-session
         ;;
-    *) 
-        exec $1
-        ;;
+    *)
+        exec "$1"
 esac