From fb7c0e6cde9a614b6f16d8435f784cc1fffad1cf Mon Sep 17 00:00:00 2001 From: Brian Cameron Date: Fri, 6 Apr 2007 05:36:43 +0000 Subject: Fix script so it works with Solaris /bin/sh. 2007-04-06 Brian Cameron * daemon/gdm.in: Fix script so it works with Solaris /bin/sh. svn path=/trunk/; revision=4772 --- ChangeLog | 4 ++++ daemon/gdm.in | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6bf88386..5d869a90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-04-06 Brian Cameron + + * daemon/gdm.in: Fix script so it works with Solaris /bin/sh. + 2007-04-06 Brian Cameron * config/CDE.desktop.in: Change name of CDE to "Common Desktop 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 "$@" -- cgit v1.2.1