From b603bf95b18c60fba4d6aa3ad2cb597c197ca6b5 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sat, 11 Aug 2012 04:29:29 +0200
Subject: move archlinux(7) and locale.sh to filesystem

The new locale.sh makes DAEMON_LOCALE redundant, so we remove that
functionality. A post-upgrade notice will be added.

The new functionality will apply the settings to /etc/locale.conf
system-wide, and allow each user to override it in
$HOME/.config/locale.conf.

Signed-off-by: Tom Gundersen <teg@jklm.no>
---
 locale.sh | 83 ---------------------------------------------------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 locale.sh

(limited to 'locale.sh')

diff --git a/locale.sh b/locale.sh
deleted file mode 100644
index c465f6f..0000000
--- a/locale.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-unset LANG
-
-if [ -s /etc/locale.conf ]; then
-	. /etc/locale.conf
-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
-	unset LC_CTYPE
-fi
-
-if [ -n "$LC_NUMERIC" ]; then
-	export LC_NUMERIC
-else
-	unset LC_NUMERIC
-fi
-
-if [ -n "$LC_TIME" ]; then
-	export LC_TIME
-else
-	unset LC_TIME
-fi
-
-if [ -n "$LC_COLLATE" ]; then
-	export LC_COLLATE
-else
-	unset LC_COLLATE
-fi
-
-if [ -n "$LC_MONETARY" ]; then
-	export LC_MONETARY
-else
-	unset LC_MONETARY
-fi
-
-if [ -n "$LC_MESSAGES" ]; then
-	export LC_MESSAGES
-else
-	unset LC_MESSAGES
-fi
-
-if [ -n "$LC_PAPER" ]; then
-	export LC_PAPER
-else
-	unset LC_PAPER
-fi
-
-if [ -n "$LC_NAME" ]; then
-	export LC_NAME
-else
-	unset LC_NAME
-fi
-
-if [ -n "$LC_ADDRESS" ]; then
-	export LC_ADDRESS
-else
-	unset LC_ADDRESS
-fi
-
-if [ -n "$LC_TELEPHONE" ]; then
-	export LC_TELEPHONE
-else
-	unset LC_TELEPHONE
-fi
-
-if [ -n "$LC_MEASUREMENT" ]; then
-	export LC_MEASUREMENT
-else
-	unset LC_MEASUREMENT
-fi
-
-if [ -n "$LC_IDENTIFICATION" ]; then
-	export LC_IDENTIFICATION
-else
-	unset LC_IDENTIFICATION
-fi
-- 
cgit v1.2.3