diff options
| author | George Lebl <jirka@5z.com> | 2003-09-29 21:33:48 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2003-09-29 21:33:48 +0000 |
| commit | 4a1f1b22cb6dac873c0388e12956eeb4949bbe64 (patch) | |
| tree | 3be8b40313f6b613712c8710cb5db4dba97256fd /config/Xsession.in | |
| parent | 508b254e93e86f61a206ce6910bcf526563219c0 (diff) | |
| download | gdm-4a1f1b22cb6dac873c0388e12956eeb4949bbe64.tar.gz | |
Be more careful with shell stuff and quote whatever we can, should fix rh
Mon Sep 29 14:32:18 2003 George Lebl <jirka@5z.com>
* config/PreSession.in, config/PostSession.in, config/XKeepsCrashing,
config/Xsession.in: Be more careful with shell stuff and quote
whatever we can, should fix rh #105858.
* daemon/misc.c, config/XKeepsCrashing: Don't use gdialog as it's
nowdays just a wrapper on zenity
Diffstat (limited to 'config/Xsession.in')
| -rwxr-xr-x | config/Xsession.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config/Xsession.in b/config/Xsession.in index 1dbd4f2e..f648e764 100755 --- a/config/Xsession.in +++ b/config/Xsession.in @@ -30,10 +30,10 @@ echo "$0: Beginning session setup..." # First read /etc/profile and .profile test -f /etc/profile && . /etc/profile -test -f $HOME/.profile && . $HOME/.profile +test -f "$HOME/.profile" && . "$HOME/.profile" # Second read /etc/xprofile and .xprofile for X specific setup test -f /etc/xprofile && . /etc/xprofile -test -f $HOME/.xprofile && . $HOME/.xprofile +test -f "$HOME/.xprofile" && . "$HOME/.xprofile" # Translation stuff if [ -x "@EXPANDED_LIBEXECDIR@/gdmtranslate" ] ; then @@ -45,7 +45,7 @@ fi # Note that this should only go to zenity dialogs which always expect utf8 gettextfunc () { if [ "x$gdmtranslate" != "x" ] ; then - $gdmtranslate --utf8 "$1" + "$gdmtranslate" --utf8 "$1" else echo "$1" fi @@ -61,7 +61,7 @@ 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"` + "$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"` else echo "$0: Starting the failsafe xterm session." fi @@ -74,12 +74,12 @@ fi # clean up after xbanner freetemp=`which freetemp 2>/dev/null` if [ -n "$freetemp" ] ; then - $freetemp + "$freetemp" fi -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -userxkbmap=$HOME/.Xkbmap +userresources="$HOME/.Xresources" +usermodmap="$HOME/.Xmodmap" +userxkbmap="$HOME/.Xkbmap" sysresources=/etc/X11/Xresources sysmodmap=/etc/X11/Xmodmap @@ -207,7 +207,7 @@ if [ "x$command" = "xdefault" ] ; then fi # add ssh-agent if found -sshagent=`which ssh-agent 2>/dev/null` +sshagent="`which ssh-agent 2>/dev/null`" if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then command="$sshagent -- $command" elif [ -z "$sshagent" ] ; then @@ -221,7 +221,7 @@ eval exec $command echo "$0: Executing $command failed, will run xterm" if [ -n "$zenity" ] ; then - $zenity --info --text `gettextfunc "I could not start your session and so I have started 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"` + "$zenity" --info --text `gettextfunc "I could not start your session and so I have started 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"` fi exec xterm -geometry 80x24+0+0 |