diff options
Diffstat (limited to 'source/x/x11-skel/scripts/xwmconfig')
| -rw-r--r-- | source/x/x11-skel/scripts/xwmconfig | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/x/x11-skel/scripts/xwmconfig b/source/x/x11-skel/scripts/xwmconfig index 944207bf..724242ab 100644 --- a/source/x/x11-skel/scripts/xwmconfig +++ b/source/x/x11-skel/scripts/xwmconfig @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 1999, 2002 Patrick Volkerding, Moorhead, Minnesota USA +# Copyright 1999, 2002, 2012 Patrick Volkerding, Moorhead, Minnesota USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -50,7 +50,7 @@ fi if [ "$USER" = "root" ]; then BACKTITLE="--backtitle \"Setting system-wide default window manager in /etc/X11/xinit/\"" else - BACKTITLE="--backtitle \"Setting default window manager in $HOME/.xinitrc\"" + BACKTITLE="--backtitle \"Setting default window manager in $HOME/.xinitrc and $HOME/.xsession\"" fi # This stops --backtitle from cluttering the initial install: @@ -211,13 +211,19 @@ if [ "$USER" = "root" ]; then fi fi -# Also set up a new $HOME/.xinitrc: +# Also set up a new $HOME/.xinitrc and $HOME/.xinitrc: if [ -r /etc/X11/xinit/$OUTPUT -a ! "$HOME" = "/" ]; then if [ -r $HOME/.xinitrc ]; then rm -f $HOME/.xinitrc-backup mv $HOME/.xinitrc $HOME/.xinitrc-backup fi cat /etc/X11/xinit/$OUTPUT > $HOME/.xinitrc + if [ -r $HOME/.xsession ]; then + rm -f $HOME/.xsession-backup + mv $HOME/.xsession $HOME/.xsession-backup + fi + cat /etc/X11/xinit/$OUTPUT > $HOME/.xsession + chmod 755 $HOME/.xsession fi rm -f $TMP/tmpscript.sh $TMP/output |