mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
base-files: don't overwrite existing locale and define default LANG
This commit is contained in:
parent
63f8d8599f
commit
79ba662fb0
2 changed files with 11 additions and 4 deletions
|
@ -1,9 +1,16 @@
|
||||||
# Sets up locale system settings from /etc/locale.conf.
|
# Sets up locale system settings from /etc/locale.conf.
|
||||||
#
|
#
|
||||||
if [ -s /etc/locale.conf ]; then
|
|
||||||
. /etc/locale.conf
|
# Don't load locale.conf if locale is already set up
|
||||||
|
if [ -z "$LANG" ]; then
|
||||||
|
if [ -s /etc/locale.conf ]; then
|
||||||
|
. /etc/locale.conf
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# define default LANG to C.UTF-8 if not already set
|
||||||
|
LANG="${LANG:-C.UTF-8}"
|
||||||
|
|
||||||
export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY
|
export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY
|
||||||
export LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
|
export LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
|
||||||
export LC_INDENTIFICATION
|
export LC_IDENTIFICATION
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'base-files'
|
# Template file for 'base-files'
|
||||||
pkgname=base-files
|
pkgname=base-files
|
||||||
version=0.144
|
version=0.145
|
||||||
revision=1
|
revision=1
|
||||||
bootstrap=yes
|
bootstrap=yes
|
||||||
depends="xbps-triggers"
|
depends="xbps-triggers"
|
||||||
|
|
Loading…
Add table
Reference in a new issue