aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--initscripts.spec5
-rwxr-xr-xlang.csh20
3 files changed, 25 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 7806ef20..307bc17e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+2000-02-07 Nalin Dahyabhai <nalin@redhat.com>
+
+ * lang.csh
+ check that LANG/LC_ALL/LINGUAS are set before we test what they're
+ set to
+
2000-02-05 Nalin Dahyabhai <nalin@redhat.com>
* rc.d/init.d/single:
- whoops, single should really check that it got start before it does anything
+ whoops, single should really check that it got start before it
+ does anything
* initscripts.spec, rc.d/init.d/random:
fix bug 9102
diff --git a/initscripts.spec b/initscripts.spec
index 8ee077c9..3b171100 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/rc.d scripts.
Name: initscripts
-%define version 4.91
+%define version 4.92
Version: %{version}
Copyright: GPL
Group: System Environment/Base
@@ -228,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Mon Feb 7 2000 Nalin Dahyabhai <nalin@redhat.com>
+- check that LC_ALL/LINGUAS and LANG are set before referencing them in lang.csh
+
* Fri Feb 4 2000 Nalin Dahyabhai <nalin@redhat.com>
- fix bug #9102
diff --git a/lang.csh b/lang.csh
index baa504a2..8e77e094 100755
--- a/lang.csh
+++ b/lang.csh
@@ -3,19 +3,25 @@
test -f /etc/sysconfig/i18n
if ($status == 0) then
eval `sed 's|=C$|=en_US|g' /etc/sysconfig/i18n | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|' `
- if ($LC_ALL == $LANG) then
- unsetenv LC_ALL
+ if ($?LC_ALL && $?LANG) then
+ if ($LC_ALL == $LANG) then
+ unsetenv LC_ALL
+ endif
endif
- if ($LINGUAS == $LANG) then
- unsetenv LINGUAS
+ if ($?LINGUAS && $?LANG) then
+ if ($LINGUAS == $LANG) then
+ unsetenv LINGUAS
+ endif
endif
if ($?SYSFONTACM) then
switch ($SYSFONTACM)
case iso01*|iso02*|iso15*|koi*|latin2-ucw*:
- if ( "$TERM" == "linux" ) then
- if ( ls -l /proc/$$/fd/0 2>/dev/null | grep -- '-> /dev/tty[0-9]*$' >/dev/null 2>&1) then
- echo -n -e '\033(K' > /proc/$$/fd/0
+ if ( $?TERM ) then
+ if ( "$TERM" == "linux" ) then
+ if ( ls -l /proc/$$/fd/0 2>/dev/null | grep -- '-> /dev/tty[0-9]*$' >/dev/null 2>&1) then
+ echo -n -e '\033(K' > /proc/$$/fd/0
+ endif
endif
endif
breaksw