From 0ebcbde79a97aafe18b7b9b97166cecca7434fe2 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Thu, 8 May 2025 10:00:32 +0200
Subject: [PATCH] fixes

---
 misc/build.func   | 10 ++++++++++
 misc/install.func | 14 +++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/misc/build.func b/misc/build.func
index 8f06c41..3488c7b 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -1267,6 +1267,16 @@ http://dl-cdn.alpinelinux.org/alpine/latest-stable/community
 EOF'
     pct exec "$CTID" -- ash -c "apk add bash curl >/dev/null"
   else
+    # Set locale and timezone before update
+    pct exec "$CTID" -- bash -c "sed -i '/$LANG/ s/^# //' /etc/locale.gen"
+    pct exec "$CTID" -- bash -c "locale_line=\$(grep -v '^#' /etc/locale.gen | grep -E '^[a-zA-Z]' | awk '{print \$1}' | head -n 1) && \
+    echo LANG=\$locale_line >/etc/default/locale && \
+    locale-gen >/dev/null && \
+    export LANG=\$locale_line"
+
+    pct exec "$CTID" -- bash -c "echo $tz >/etc/timezone && ln -sf /usr/share/zoneinfo/$tz /etc/localtime"
+
+    # Install curl
     pct exec "$CTID" -- bash -c "apt-get update >/dev/null && apt-get install -y curl >/dev/null"
   fi
   lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/install/"$var_install".sh)" $?
diff --git a/misc/install.func b/misc/install.func
index 120bc65..a0894ab 100644
--- a/misc/install.func
+++ b/misc/install.func
@@ -64,13 +64,13 @@ error_handler() {
 # This function sets up the Container OS by generating the locale, setting the timezone, and checking the network connection
 setting_up_container() {
   msg_info "Setting up Container OS"
-  sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-  locale_line=$(grep -v '^#' /etc/locale.gen | grep -E '^[a-zA-Z]' | awk '{print $1}' | head -n 1)
-  echo "LANG=${locale_line}" >/etc/default/locale
-  locale-gen >/dev/null
-  export LANG=${locale_line}
-  echo $tz >/etc/timezone
-  ln -sf /usr/share/zoneinfo/$tz /etc/localtime
+  #sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
+  #locale_line=$(grep -v '^#' /etc/locale.gen | grep -E '^[a-zA-Z]' | awk '{print $1}' | head -n 1)
+  #echo "LANG=${locale_line}" >/etc/default/locale
+  #locale-gen >/dev/null
+  #export LANG=${locale_line}
+  #echo $tz >/etc/timezone
+  #ln -sf /usr/share/zoneinfo/$tz /etc/localtime
   for ((i = RETRY_NUM; i > 0; i--)); do
     if [ "$(hostname -I)" != "" ]; then
       break