summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2015-02-08 14:28:56 +0000
committerColin Guthrie <colin@mageia.org>2015-02-08 15:30:26 +0000
commit6c23072af9db257153d993e6a87bfc02b69a2263 (patch)
tree19810554501166b11e424b849959d53bb5709bf1 /perl-install/standalone
parent8598eb09637c23d2f21d4807d30c691b5cb17dbd (diff)
downloaddrakx-6c23072af9db257153d993e6a87bfc02b69a2263.tar
drakx-6c23072af9db257153d993e6a87bfc02b69a2263.tar.gz
drakx-6c23072af9db257153d993e6a87bfc02b69a2263.tar.bz2
drakx-6c23072af9db257153d993e6a87bfc02b69a2263.tar.xz
drakx-6c23072af9db257153d993e6a87bfc02b69a2263.zip
i18n: Use the x-distro /etc/locale.conf file instead of /etc/sysconfig/i18n
Ensure we read and write the /etc/locale.conf file, but still support reading from /etc/sysconfig/i18n to cope with upgrades.
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/finish-install.xsetup8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/standalone/finish-install.xsetup b/perl-install/standalone/finish-install.xsetup
index aebe4db28..1b53e9ff8 100755
--- a/perl-install/standalone/finish-install.xsetup
+++ b/perl-install/standalone/finish-install.xsetup
@@ -5,8 +5,12 @@
if [ -f /etc/sysconfig/finish-install -a -x /usr/sbin/finish-install ]; then
. /etc/sysconfig/finish-install
if [ "$FINISH_INSTALL" = yes ]; then
- if [ -r /etc/sysconfig/i18n ]; then
- . /etc/sysconfig/i18n
+ if [ -r /etc/sysconfig/i18n -o -r /etc/locale.conf ]; then
+ if [ -r /etc/locale.conf ]; then
+ . /etc/locale.conf
+ else
+ . /etc/sysconfig/i18n
+ fi
export LANGUAGE LC_ADDRESS LC_COLLATE LC_NAME LC_NUMERIC LC_MEASUREMENT LC_TIME \
LANG LC_IDENTIFICATION LC_MESSAGES LC_CTYPE LC_TELEPHONE LC_MONETARY LC_PAPER
fi