aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororeo639 <oreo6391@gmail.com>2022-09-13 17:22:19 +0000
committerLeah Neukirchen <leah@vuxu.org>2025-02-25 12:33:21 +0000
commit79ba662fb05160f8b49a11d5faaee5b274fc02bf (patch)
tree98a7c0b36d287e916c8383f17bac0ddf0f5f7d20
parent63f8d8599fa366091cf25f98e8c95469347c6ae1 (diff)
downloadvoid-packages-79ba662fb05160f8b49a11d5faaee5b274fc02bf.tar
void-packages-79ba662fb05160f8b49a11d5faaee5b274fc02bf.tar.gz
void-packages-79ba662fb05160f8b49a11d5faaee5b274fc02bf.tar.bz2
void-packages-79ba662fb05160f8b49a11d5faaee5b274fc02bf.tar.lz
void-packages-79ba662fb05160f8b49a11d5faaee5b274fc02bf.tar.xz
void-packages-79ba662fb05160f8b49a11d5faaee5b274fc02bf.tar.zst
void-packages-79ba662fb05160f8b49a11d5faaee5b274fc02bf.zip
base-files: don't overwrite existing locale and define default LANG
-rw-r--r--srcpkgs/base-files/files/locale.sh13
-rw-r--r--srcpkgs/base-files/template2
2 files changed, 11 insertions, 4 deletions
diff --git a/srcpkgs/base-files/files/locale.sh b/srcpkgs/base-files/files/locale.sh
index 8486367bfab..dffa0f7e666 100644
--- a/srcpkgs/base-files/files/locale.sh
+++ b/srcpkgs/base-files/files/locale.sh
@@ -1,9 +1,16 @@
# 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
+# 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 LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
-export LC_INDENTIFICATION
+export LC_IDENTIFICATION
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 64e756be34d..f925178f19b 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
# Template file for 'base-files'
pkgname=base-files
-version=0.144
+version=0.145
revision=1
bootstrap=yes
depends="xbps-triggers"