From 4d6178953060b79af0b2aa14d36c972989662d35 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Sat, 28 Apr 2012 20:10:01 -0400
Subject: locale.sh: try harder to ensure locale is set

If LANG is never set by /etc/locale.conf or /etc/rc.conf, ensure that we
fall back on LANG=C.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
 locale.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/locale.sh b/locale.sh
index fe82378..c465f6f 100644
--- a/locale.sh
+++ b/locale.sh
@@ -4,16 +4,12 @@ if [ -s /etc/locale.conf ]; then
 	. /etc/locale.conf
 fi
 
-if [ -n "$LANG" ]; then
-	export LANG
-else
-	if [ -s /etc/rc.conf ]; then
-		export LANG=$(. /etc/rc.conf 2> /dev/null ; echo "$LOCALE")
-	else
-		export LANG="C"
-	fi
+if [ -z "$LANG" ] && [ -s /etc/rc.conf ]; then
+	LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE")
 fi
 
+export LANG=${LANG:-C}
+
 if [ -n "$LC_CTYPE" ]; then
 	export LC_CTYPE
 else
-- 
cgit v1.2.3