From 79ffc28973bae3c799cecb9f3c2e1244d528415e Mon Sep 17 00:00:00 2001 From: George Lebl Date: Mon, 2 Aug 2004 22:24:36 +0000 Subject: fix #144007 by setting $command before sourcing any files which may screw Mon Aug 02 15:17:43 2004 George Lebl * config/Xsession.in: fix #144007 by setting $command before sourcing any files which may screw up our argument array --- ChangeLog | 5 +++++ config/Xsession.in | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 893425da..14e23f36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 02 15:17:43 2004 George Lebl + + * 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 * Patch from Andreas Schubert 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"` -- cgit v1.2.1