Skip to content
Snippets Groups Projects
Commit b2f443ef authored by Sébastien Luttringer's avatar Sébastien Luttringer
Browse files

Remove LC_ALL

- Restore previous loading of /etc/locale.sh
parent 4547e657
No related branches found
No related tags found
No related merge requests found
......@@ -2,8 +2,8 @@
# Contributor: Tom Gundersen <teg@jklm.no>
pkgname=filesystem
pkgver=2017.12
pkgrel=2
pkgver=2018.1
pkgrel=1
pkgdesc='Base Arch Linux files'
arch=('x86_64')
license=('GPL')
......@@ -27,7 +27,7 @@ md5sums=('5fa6674df7645d7f5895f2d12b4ef4e9'
'a1315ea3e2b64d197b6efaf9c14ff778'
'7813c481156f6b280a3ba91fc6236368'
'5deb9f890a4d08a245e9752ede77271e'
'380ccce470d309efb631f7ec3f86db48'
'43a64ac3de43bbfbdbc306cdf3682fb4'
'd41d8cd98f00b204e9800998ecf8427e'
'981ee4d7e506a9d6d9ed2d872e16004b'
'0a0fbb8e64faabb40023bd180d7190a1'
......
......@@ -2,11 +2,14 @@
# load locale.conf in XDG paths.
# /etc/locale.conf loads and overrides by kernel command line is done by systemd
# But we override it here, see FS#56688
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
......@@ -14,6 +17,5 @@ fi
LANG=${LANG:-C}
# export all locale (7) variables when they exist
export LANG LANGUAGE LC_ALL LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_IDENTIFICATION \
LC_MEASUREMENT
export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_NAME\
LC_MESSAGES LC_NAME LC_ADDRESS LC_TELEPHONE LC_IDENTIFICATION LC_MEASUREMENT
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment