Leverage .xsessionrc to force our own session

.xsession

@@ -69,6 +69,10 @@ done
   done
 } &
 
-for wm in awesome fvwm2 icewm startkde fluxbox enlightenment mwm twm xterm; do
-  [ -x "`which $wm 2>/dev/null`" ] && exec $sshagent $wm
+if [ $# -gt 0 ]; then
+  exec "$@"
+fi
+
+for wm in $wm awesome icewm fluxbox twm xterm; do
+  type $wm >/dev/null && exec $execpre $wm
 done

.xsessionrc

@@ -0,0 +1,2 @@
+#! sh
+STARTUP="$HOME/.xsession $STARTUP"

bin/tpope-config

@@ -12,8 +12,8 @@ base_files="\
 .muttrc .urlview .mailcap .curlrc \
 .gnupg/gpg.conf .ssh/config .ssh/authorized_keys \
 .cvsignore .gitconfig .git_template \
-.xsession .Xresources .xbindkeys.scm .gtkrc .gtkrc-2.0 .netscape/user.js \
-.pixmaps/mini \
+.xsession .xsessionrc .Xresources .xbindkeys.scm .gtkrc .gtkrc-2.0 \
+.pixmaps/mini .netscape/user.js \
 .config/awesome/rc.lua .config/awesome/theme.lua \
 bin/x-terminal-emulator bin/sensible-browser bin/tpope \
 bin/tpope-config bin/tpope-host bin/tpope-media bin/tpope-setup \