From 53e7eaab86355089e65b23d23cb712008df6389d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 29 Oct 2014 22:04:56 -0200
Subject: filesystem-2014.10-3.parabola1: updating version

* avoid overwriting LANG in locale.sh (FS#42162 -> https://bugs.archlinux.org/task/42162)
* give more realistic examples in /etc/crypttab (FS#34452 -> https://bugs.archlinux.org/task/34452)
* remove tracking of /var/cache/man. man-db controls this directory
* update Parabola URL
---
 libre/filesystem/locale.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'libre/filesystem/locale.sh')

diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh
index 3cfc89c1b..b66587203 100644
--- a/libre/filesystem/locale.sh
+++ b/libre/filesystem/locale.sh
@@ -1,14 +1,13 @@
 #!/bin/sh
 
-unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \
-      LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
-
-if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
-  . "$XDG_CONFIG_HOME/locale.conf"
-elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
-  . "$HOME/.config/locale.conf"
-elif [ -r /etc/locale.conf ]; then
-  . /etc/locale.conf
+if [ -z "$LANG" ]; then
+  if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
+    . "$XDG_CONFIG_HOME/locale.conf"
+  elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
+    . "$HOME/.config/locale.conf"
+  elif [ -r /etc/locale.conf ]; then
+    . /etc/locale.conf
+  fi
 fi
 
 LANG=${LANG:-C}
-- 
cgit v1.2.3