Merge pull request #5544 from craigcomstock/ENT-11885/master

ENT-11885: Adjusted masterfiles stage script to choose an available locale
cfengine · Jun 19, 2024 · 003f410 · 003f410
2 parents 47bf207 + b99fa9a
commit 003f410
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/contrib/masterfiles-stage/common.sh b/contrib/masterfiles-stage/common.sh
@@ -194,7 +194,16 @@ git_cfbs_deploy_refspec() {
   #    (See long comment at end of function def.)
 
   # The chipmunk in cfbs output breaks things without this or similar
-  export LC_ALL=en_US.utf-8
+  # The chipmunk in cfbs output breaks things without this or similar
+  if [ -f "/etc/locale.conf" ]; then
+    source "/etc/locale.conf"
+    export LC_ALL="$LANG" # retrieved from locale.conf
+  else
+    _LOCALE=$(locale -a | grep -i utf | head -1)
+    if [ -n "$_LOCALE" ]; then
+      export LC_ALL="$_LOCALE"
+    fi
+  fi
 
   # Ensure absolute pathname is given
   [ "${1:0:1}" = / ] ||