From e431b4a1df6299b882b51e2a5f1be487161727c4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 13 Sep 2022 10:22:19 -0700
Subject: [PATCH] base-files: don't overwrite existing locale and define
 default LANG

---
 srcpkgs/base-files/files/locale.sh | 67 ++++++++++++++++++++++++++++++
 srcpkgs/base-files/template        |  2 +-
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/base-files/files/locale.sh b/srcpkgs/base-files/files/locale.sh
index 8486367bfabf..d5b583d82b53 100644
--- a/srcpkgs/base-files/files/locale.sh
+++ b/srcpkgs/base-files/files/locale.sh
@@ -1,9 +1,76 @@
 # Sets up locale system settings from /etc/locale.conf.
 #
+
+_backup_LANG="${LANG}"
+_backup_LANGUAGE="${LANGUAGE}"
+_backup_LC_CTYPE="${LC_CTYPE}"
+_backup_LC_NUMERIC="${LC_NUMERIC}"
+_backup_LC_TIME="${LC_TIME}"
+_backup_LC_COLLATE="${LC_COLLATE}"
+_backup_LC_MONETARY="${LC_MONETARY}"
+_backup_LC_MESSAGES="${LC_MESSAGES}"
+_backup_LC_PAPER="${LC_PAPER}"
+_backup_LC_NAME="${LC_NAME}"
+_backup_LC_ADDRESS="${LC_ADDRESS}"
+_backup_LC_TELEPHONE="${LC_TELEPHONE}"
+_backup_LC_MEASUREMENT="${LC_MEASUREMENT}"
+_backup_LC_INDENTIFICATION="${LC_INDENTIFICATION}"
+
 if [ -s /etc/locale.conf ]; then
 	. /etc/locale.conf
 fi
 
+if [ -n "${_backup_LANG}" ]; then
+    LANG="${_backup_LANG}"
+fi
+if [ -n "${_backup_LANGUAGE}" ]; then
+    LANGUAGE="${_backup_LANGUAGE}"
+fi
+if [ -n "${_backup_LC_CTYPE}" ]; then
+    LC_CTYPE="${_backup_LC_CTYPE}"
+fi
+if [ -n "${_backup_LC_NUMERIC}" ]; then
+    LC_NUMERIC="${_backup_LC_NUMERIC}"
+fi
+if [ -n "${_backup_LC_TIME}" ]; then
+    LC_TIME="${_backup_LC_TIME}"
+fi
+if [ -n "${_backup_LC_COLLATE}" ]; then
+    LC_COLLATE="${_backup_LC_COLLATE}"
+fi
+if [ -n "${_backup_LC_MONETARY}" ]; then
+    LC_MONETARY="${_backup_LC_MONETARY}"
+fi
+if [ -n "${_backup_LC_MESSAGES}" ]; then
+    LC_MESSAGES="${_backup_LC_MESSAGES}"
+fi
+if [ -n "${_backup_LC_PAPER}" ]; then
+    LC_PAPER="${_backup_LC_PAPER}"
+fi
+if [ -n "${_backup_LC_NAME}" ]; then
+    LC_NAME="${_backup_LC_NAME}"
+fi
+if [ -n "${_backup_LC_ADDRESS}" ]; then
+    LC_ADDRESS="${_backup_LC_ADDRESS}"
+fi
+if [ -n "${_backup_LC_TELEPHONE}" ]; then
+    LC_TELEPHONE="${_backup_LC_TELEPHONE}"
+fi
+if [ -n "${_backup_LC_MEASUREMENT}" ]; then
+    LC_MEASUREMENT="${_backup_LC_MEASUREMENT}"
+fi
+if [ -n "${_backup_LC_INDENTIFICATION}" ]; then
+    LC_INDENTIFICATION="${_backup_LC_INDENTIFICATION}"
+fi
+
+unset _backup_LANG _backup_LANGUAGE _backup_LC_CTYPE _backup_LC_NUMERIC
+unset _backup_LC_TIME _backup_LC_COLLATE _backup_LC_MONETARY _backup_LC_MESSAGES
+unset _backup_LC_PAPER _backup_LC_NAME _backup_LC_ADDRESS _backup_LC_TELEPHONE
+unset _backup_LC_MEASUREMENT _backup_LC_INDENTIFICATION 
+
+# define default LANG to C.UTF-8 if not already defined
+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
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index b96d09351a08..3f2696ba6954 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.143
-revision=2
+revision=3
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"