diff options
| author | George Lebl <jirka@5z.com> | 2004-08-02 22:24:36 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2004-08-02 22:24:36 +0000 |
| commit | 79ffc28973bae3c799cecb9f3c2e1244d528415e (patch) | |
| tree | f0131056f3fe912a31553adb4fff8dd430e91b16 | |
| parent | 3083d095e3ab7e48118652345a0ed42506361c32 (diff) | |
| download | gdm-79ffc28973bae3c799cecb9f3c2e1244d528415e.tar.gz | |
fix #144007 by setting $command before sourcing any files which may screw
Mon Aug 02 15:17:43 2004 George Lebl <jirka@5z.com>
* config/Xsession.in: fix #144007 by setting $command before
sourcing any files which may screw up our argument array
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | config/Xsession.in | 12 |
2 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Mon Aug 02 15:17:43 2004 George Lebl <jirka@5z.com> + + * config/Xsession.in: fix #144007 by setting $command before + sourcing any files which may screw up our argument array + Wed Jul 14 09:37:25 2004 George Lebl <jirka@5z.com> * Patch from Andreas Schubert <andreas.schubert@mathema.de> diff --git a/config/Xsession.in b/config/Xsession.in index b0d0f3a9..1e0cdd7c 100755 --- a/config/Xsession.in +++ b/config/Xsession.in @@ -24,6 +24,12 @@ # based on: # $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ +command="$1" + +if [ -z "$command" ] ; then + command=failsafe +fi + # this will go into the .xsession-errors along with all other echo's # good for debugging where things went wrong echo "$0: Beginning session setup..." @@ -69,12 +75,6 @@ gdmwhich () { zenity=`gdmwhich zenity` -command="$1" - -if [ -z "$command" ] ; then - command=failsafe -fi - if [ x"$command" = xfailsafe ] ; then if [ -n "$zenity" ] ; then "$zenity" --info --text `gettextfunc "This is the failsafe xterm session. Windows now have focus only if you have your cursor above them. To get out of this mode type 'exit' in the window in the upper left corner"` |