diff options
| author |   Achim Gottinger <achim@gentoo.org> | 2001-01-05 03:50:32 +0000 |
|---|---|---|
| committer | Achim Gottinger <achim@gentoo.org> | 2001-01-05 03:50:32 +0000 |
| commit | 357aec40e79c653d93530560447b1ccd04ea48a8 (patch) | |
| tree | 1217a170bdb2089b9e06281ce6785893b1b6c110 /x11-base | |
| parent | *** empty log message *** (diff) | |
| download | gentoo-2-357aec40e79c653d93530560447b1ccd04ea48a8.tar.gz gentoo-2-357aec40e79c653d93530560447b1ccd04ea48a8.tar.bz2 gentoo-2-357aec40e79c653d93530560447b1ccd04ea48a8.zip | |
*** empty log message ***
Diffstat (limited to 'x11-base')
| -rwxr-xr-x | x11-base/xfree/files/Xsession | 24 | ||||
| -rw-r--r-- | x11-base/xfree/files/xinitrc | 9 |
2 files changed, 24 insertions, 9 deletions
diff --git a/x11-base/xfree/files/Xsession b/x11-base/xfree/files/Xsession index d6dbdff4f950..42215d8b80e8 100755 --- a/x11-base/xfree/files/Xsession +++ b/x11-base/xfree/files/Xsession @@ -17,10 +17,10 @@ done case $# in 1) - if [ -f /usr/X11R6/bin/start.$1 ] + if [ -f /usr/X11R6/bin/wm/$1 ] then source /etc/profile - /usr/X11R6/bin/start.$1 + /usr/X11R6/bin/wm/$1 else #failsafe exec xterm -geometry 80x24-0-0 @@ -34,13 +34,23 @@ case $# in if [ -s "$startup" -a -x "$startup" ]; then exec "$startup" else - if [ -r "$resources" ]; then - xrdb -load "$resources" - fi + if [ -f $HOME/.wm ] + then + mywm="/usr/X11R6/bin/wm/`cat $HOME/.wm`" + if [ -f $mywm ] + then + source /etc/profile + $mywm + exit 0 + fi + else + if [ -r "$resources" ]; then + xrdb -load "$resources" + exec xsm + fi + fi fi - exec xsm ;; esac -echo $# $1 > /root/information
\ No newline at end of file diff --git a/x11-base/xfree/files/xinitrc b/x11-base/xfree/files/xinitrc index 1e34163aa0f5..0c8faef40844 100644 --- a/x11-base/xfree/files/xinitrc +++ b/x11-base/xfree/files/xinitrc @@ -25,9 +25,14 @@ if [ -f $usermodmap ]; then fi # start some nice program -if [ -f /usr/X11R6/bin/start.$WINDOWMANAGER ] +if [ -f $HOME/.wm ] then - /usr/X11R6/bin/start.$WINDOWMANAGER + mywm="/usr/X11R6/bin/wm/`cat $HOME/.wm`" + if [ -f $mywm ] + then + $mywm + exit 0 + fi else twm & xclock -geometry 50x50-1+1 & |