[projects/rc-scripts] load systemd locale.conf after PLD-specific /etc/sysconfig/i18n

[gotar]

commit 57d85b68e1b6315c95dc274f06dbb5edb75ab6fe
Author: Tomasz Pala <gotar at pld-linux.org>
Date:   Sun Sep 6 09:02:43 2015 +0200

    load systemd locale.conf after PLD-specific /etc/sysconfig/i18n

 lang.sh | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/lang.sh b/lang.sh
index dfb0ddf..c240cc9 100755
--- a/lang.sh
+++ b/lang.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
-#
-#
 
-if [ -f /etc/sysconfig/i18n ]; then
+[ ! -f /etc/sysconfig/i18n -a ! -f /etc/locale.conf ] && exit
+
 	ORG_LANG=$LANG
 	ORG_LC_ADDRESS=$LC_ADDRESS
 	ORG_LC_COLLATE=$LC_COLLATE
@@ -18,7 +17,8 @@ if [ -f /etc/sysconfig/i18n ]; then
 	ORG_LC_TIME=$LC_TIME
 	ORG_LC_ALL=$LC_ALL
 
-	. /etc/sysconfig/i18n
+[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
+[ -f /etc/locale.conf ] && . /etc/locale.conf
 
 	# we prefer session settings (that came from ssh for example)
 	# instead of system one
@@ -38,9 +38,9 @@ if [ -f /etc/sysconfig/i18n ]; then
 	LC_TIME=${ORG_LC_TIME:-$LC_TIME}
 	LC_ALL=${ORG_LC_ALL:-$LC_ALL}
 
-	unset ORG_LANG ORG_LC_ADDRESS ORG_LC_COLLATE ORG_LC_CTYPE ORG_LC_IDENTIFICATION ORG_LC_MEASUREMENT
-	unset ORG_LC_MESSAGES ORG_LC_MONETARY ORG_LC_NAME ORG_LC_NUMERIC ORG_LC_PAPER ORG_LC_TELEPHONE
-	unset ORG_LC_TIME ORG_LC_ALL
+unset ORG_LANG ORG_LC_ADDRESS ORG_LC_COLLATE ORG_LC_CTYPE ORG_LC_IDENTIFICATION ORG_LC_MEASUREMENT \
+	ORG_LC_MESSAGES ORG_LC_MONETARY ORG_LC_NAME ORG_LC_NUMERIC ORG_LC_PAPER ORG_LC_TELEPHONE \
+	ORG_LC_TIME ORG_LC_ALL
 
 	[ "$LANG" ] && export LANG || unset LANG
 	[ "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS
@@ -56,14 +56,11 @@ if [ -f /etc/sysconfig/i18n ]; then
 	[ "$LC_TELEPHONE" ] && export LC_TELEPHONE || unset LC_TELEPHONE
 	[ "$LC_TIME" ] && export LC_TIME || unset LC_TIME
 	[ "$LC_ALL" ] && export LC_ALL || unset LC_ALL
-	[ "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
-	[ "$LINGUAS" ] && export LINGUAS || unset LINGUAS
-
-	[ "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET
 
-	if [ "$INPUTRC" ]; then
-		export INPUTRC
-	fi
+[ "$LANGUAGE" ]	&& export LANGUAGE
+[ "$LINGUAS" ]	&& export LINGUAS
+[ "$_XKB_CHARSET" ]	&& export _XKB_CHARSET
+[ "$INPUTRC" ]	&& export INPUTRC
 
 	if [ "$LESSCHARSET" ]; then
 		export LESSCHARSET
@@ -71,4 +68,3 @@ if [ -f /etc/sysconfig/i18n ]; then
 		LESSCHARSET=latin1
 		export LESSCHARSET
 	fi
-fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/rc-scripts.git/commitdiff/57d85b68e1b6315c95dc274f06dbb5edb75ab6fe