SVN: rc-scripts/trunk/lang.sh

[glen]

Author: glen
Date: Mon Dec 10 23:25:57 2007
New Revision: 9135

Modified:
   rc-scripts/trunk/lang.sh
Log:
- cosmetics

Modified: rc-scripts/trunk/lang.sh
==============================================================================
--- rc-scripts/trunk/lang.sh	(original)
+++ rc-scripts/trunk/lang.sh	Mon Dec 10 23:25:57 2007
@@ -4,69 +4,69 @@
 #
 
 if [ -f /etc/sysconfig/i18n ]; then
-	ORG_LANG="$LANG"
-	ORG_LC_ADDRESS="$LC_ADDRESS"
-	ORG_LC_COLLATE="$LC_COLLATE"
-	ORG_LC_CTYPE="$LC_CTYPE"
-	ORG_LC_IDENTIFICATION="$LC_IDENTIFICATION"
-	ORG_LC_MEASUREMENT="$LC_MEASUREMENT"
-	ORG_LC_MESSAGES="$LC_MESSAGES"
-	ORG_LC_MONETARY="$LC_MONETARY"
-	ORG_LC_NAME="$LC_NAME"
-	ORG_LC_NUMERIC="$LC_NUMERIC"
-	ORG_LC_PAPER="$LC_PAPER"
-	ORG_LC_TELEPHONE="$LC_TELEPHONE"
-	ORG_LC_TIME="$LC_TIME"
-	ORG_LC_ALL="$LC_ALL"
+	ORG_LANG=$LANG
+	ORG_LC_ADDRESS=$LC_ADDRESS
+	ORG_LC_COLLATE=$LC_COLLATE
+	ORG_LC_CTYPE=$LC_CTYPE
+	ORG_LC_IDENTIFICATION=$LC_IDENTIFICATION
+	ORG_LC_MEASUREMENT=$LC_MEASUREMENT
+	ORG_LC_MESSAGES=$LC_MESSAGES
+	ORG_LC_MONETARY=$LC_MONETARY
+	ORG_LC_NAME=$LC_NAME
+	ORG_LC_NUMERIC=$LC_NUMERIC
+	ORG_LC_PAPER=$LC_PAPER
+	ORG_LC_TELEPHONE=$LC_TELEPHONE
+	ORG_LC_TIME=$LC_TIME
+	ORG_LC_ALL=$LC_ALL
 
 	. /etc/sysconfig/i18n
 
 	# we prefer session settings (that came from ssh for example)
 	# instead of system one
 
-	LANG=${ORG_LANG:-${LANG}}
-	LC_ADDRESS=${ORG_LC_ADDRESS:-${LC_ADDRESS}}
-	LC_COLLATE=${ORG_LC_COLLATE:-${LC_COLLATE}}
-	LC_CTYPE=${ORG_LC_CTYPE:-${LC_CTYPE}}
-	LC_IDENTIFICATION=${ORG_LC_IDENTIFICATION:-${LC_IDENTIFICATION}}
-	LC_MEASUREMENT=${ORG_LC_MEASUREMENT:-${LC_MEASUREMENT}}
-	LC_MESSAGES=${ORG_LC_MESSAGES:-${LC_MESSAGES}}
-	LC_MONETARY=${ORG_LC_MONETARY:-${LC_MONETARY}}
-	LC_NAME=${ORG_LC_NAME:-${LC_NAME}}
-	LC_NUMERIC=${ORG_LC_NUMERIC:-${LC_NUMERIC}}
-	LC_PAPER=${ORG_LC_PAPER:-${LC_PAPER}}
-	LC_TELEPHONE=${ORG_LC_TELEPHONE:-${LC_TELEPHONE}}
-	LC_TIME=${ORG_LC_TIME:-${LC_TIME}}
-	LC_ALL=${LC_ALL:-${LC_ALL}}
+	LANG=${ORG_LANG:-$LANG}
+	LC_ADDRESS=${ORG_LC_ADDRESS:-$LC_ADDRESS}
+	LC_COLLATE=${ORG_LC_COLLATE:-$LC_COLLATE}
+	LC_CTYPE=${ORG_LC_CTYPE:-$LC_CTYPE}
+	LC_IDENTIFICATION=${ORG_LC_IDENTIFICATION:-$LC_IDENTIFICATION}
+	LC_MEASUREMENT=${ORG_LC_MEASUREMENT:-$LC_MEASUREMENT}
+	LC_MESSAGES=${ORG_LC_MESSAGES:-$LC_MESSAGES}
+	LC_MONETARY=${ORG_LC_MONETARY:-$LC_MONETARY}
+	LC_NAME=${ORG_LC_NAME:-$LC_NAME}
+	LC_NUMERIC=${ORG_LC_NUMERIC:-$LC_NUMERIC}
+	LC_PAPER=${ORG_LC_PAPER:-$LC_PAPER}
+	LC_TELEPHONE=${ORG_LC_TELEPHONE:-$LC_TELEPHONE}
+	LC_TIME=${ORG_LC_TIME:-$LC_TIME}
+	LC_ALL=${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
 
-	[ -n "$LANG" ] && export LANG || unset LANG
-	[ -n "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS
-	[ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
-	[ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
-	[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION || unset LC_IDENTIFICATION
-	[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT || unset LC_MEASUREMENT
-	[ -n "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES
-	[ -n "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY
-	[ -n "$LC_NAME" ] && export LC_NAME || unset LC_NAME
-	[ -n "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC
-	[ -n "$LC_PAPER" ] && export LC_PAPER || unset LC_PAPER
-	[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE || unset LC_TELEPHONE
-	[ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME
-	[ -n "$LC_ALL" ] && export LC_ALL || unset LC_ALL
-	[ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
-	[ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS
+	[ "$LANG" ] && export LANG || unset LANG
+	[ "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS
+	[ "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
+	[ "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
+	[ "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION || unset LC_IDENTIFICATION
+	[ "$LC_MEASUREMENT" ] && export LC_MEASUREMENT || unset LC_MEASUREMENT
+	[ "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES
+	[ "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY
+	[ "$LC_NAME" ] && export LC_NAME || unset LC_NAME
+	[ "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC
+	[ "$LC_PAPER" ] && export LC_PAPER || unset LC_PAPER
+	[ "$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
 
-	[ -n "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET
+	[ "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET
 
-	if [ -n "$INPUTRC" ]; then
+	if [ "$INPUTRC" ]; then
 		export INPUTRC
 	fi
 
-	if [ -n "$LESSCHARSET" ]; then
+	if [ "$LESSCHARSET" ]; then
 		export LESSCHARSET
 	elif [ "$TERM" = "linux-lat" ]; then
 		LESSCHARSET=latin1