diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 20:44:04 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 20:44:04 -0400 |
commit | ad482d55d2f60cf3c91c9014b934af7ea30b4d88 (patch) | |
tree | 79bb00ec5be01214f1ebc99509308f2083c17717 /.xinitrc | |
parent | 2f550711d01c7aa731d75edca9bc4d2a1f718045 (diff) | |
parent | 510fea7116c6bd01824af38b4e516b6e19fded81 (diff) |
Merge branch 'master' into build64-par
Conflicts:
.crontab
Diffstat (limited to '.xinitrc')
-rw-r--r-- | .xinitrc | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -5,10 +5,13 @@ # Executed by startx (run your window manager from here) if [ -d /etc/X11/xinit/xinitrc.d ]; then + echo ' ==> Running scripts in Entering xinitrc.d/*' for f in /etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" + echo " -> $f" + [ -x "$f" ] && "$f" & done unset f + echo ' -> done' fi usermodmap="$HOME/.xmodmap" @@ -20,4 +23,4 @@ fi # exec startkde # exec startxfce4 # ...or the Window Manager of your choice -exec wmii +exec ck-launch-session wmii |