diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-04-06 05:36:43 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-04-06 05:36:43 +0000 |
| commit | fb7c0e6cde9a614b6f16d8435f784cc1fffad1cf (patch) | |
| tree | e8935a2e1d21614e00f8b1bd2721da70eafd3be9 | |
| parent | 85cc72cf26d1850b71744b9b1144cae27e96e35c (diff) | |
| download | gdm-fb7c0e6cde9a614b6f16d8435f784cc1fffad1cf.tar.gz | |
Fix script so it works with Solaris /bin/sh.
2007-04-06 Brian Cameron <brian.cameron@sun.com>
* daemon/gdm.in: Fix script so it works with Solaris /bin/sh.
svn path=/trunk/; revision=4772
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | daemon/gdm.in | 19 |
2 files changed, 17 insertions, 6 deletions
@@ -1,5 +1,9 @@ 2007-04-06 Brian Cameron <brian.cameron@sun.com> + * daemon/gdm.in: Fix script so it works with Solaris /bin/sh. + +2007-04-06 Brian Cameron <brian.cameron@sun.com> + * config/CDE.desktop.in: Change name of CDE to "Common Desktop Environment (CDE)". diff --git a/daemon/gdm.in b/daemon/gdm.in index e669b639..adf9cf03 100644 --- a/daemon/gdm.in +++ b/daemon/gdm.in @@ -1,4 +1,5 @@ #!/bin/sh +# # A script so that # 1) we read the standard system env vars # 2) syadmins/integrators can add their own private options etc... @@ -10,17 +11,23 @@ test -f /etc/profile && . /etc/profile # LANG is set. # Make sure LANG is set +# if [ -z "$LANG" ] then - test -f /etc/sysconfig/language && export LANG=`. /etc/sysconfig/language; echo $RC_LANG` + if [ -f /etc/sysconfig/language ] + then + LANG=`. /etc/sysconfig/language; echo $RC_LANG` + export LANG + fi fi + if [ -z "$LC_MESSAGES" ] then - if [ -z "$LC_ALL" ] - then - LC_MESSAGES=$LANG - export LC_MESSAGES - fi + if [ -z "$LC_ALL" ] + then + LC_MESSAGES=$LANG + export LC_MESSAGES + fi fi exec @sbindir@/gdm-binary "$@" |