aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-08-18 15:57:54 +0000
committerBill Nottingham <notting@redhat.com>2004-08-18 15:57:54 +0000
commit9c706f8bad8439ac35a467bbd3672b90b0a6c7c0 (patch)
tree03715cc67edff6de3d75b63cbe8a24a25d022798
parent903bc93eec508359479d00b11a3e5331a414c40f (diff)
downloadinitscripts-9c706f8bad8439ac35a467bbd3672b90b0a6c7c0.tar
initscripts-9c706f8bad8439ac35a467bbd3672b90b0a6c7c0.tar.gz
initscripts-9c706f8bad8439ac35a467bbd3672b90b0a6c7c0.tar.bz2
initscripts-9c706f8bad8439ac35a467bbd3672b90b0a6c7c0.tar.xz
initscripts-9c706f8bad8439ac35a467bbd3672b90b0a6c7c0.zip
don't remove linguas (part of #9733)
-rwxr-xr-xlang.csh5
-rwxr-xr-xlang.sh10
2 files changed, 1 insertions, 14 deletions
diff --git a/lang.csh b/lang.csh
index 333463f7..a5185419 100755
--- a/lang.csh
+++ b/lang.csh
@@ -25,11 +25,6 @@ if ($sourced == 1) then
unsetenv LC_ALL
endif
endif
- if ($?LINGUAS && $?LANG) then
- if ($LINGUAS == $LANG) then
- unsetenv LINGUAS
- endif
- endif
if ($?CHARSET) then
switch ($CHARSET)
diff --git a/lang.sh b/lang.sh
index 94a3f296..4f9d2f5d 100755
--- a/lang.sh
+++ b/lang.sh
@@ -38,15 +38,7 @@ if [ "$sourced" = 1 ]; then
unset LC_ALL
fi
[ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
- if [ -n "$LINGUAS" ]; then
- if [ "$LINGUAS" != "$LANG" ]; then
- export LINGUAS
- else
- unset LINGUAS
- fi
- else
- unset LINGUAS
- fi
+ [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS
[ -n "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET
if [ -n "$CHARSET" ]; then