From 2c92e181bb2c03a9ae237db2abbf8ad9e7f97162 Mon Sep 17 00:00:00 2001 From: Jane Doe Date: Fri, 17 May 2024 19:19:41 +0000 Subject: [PATCH] Changed the way Locales are being filtered at "Selecting Locale" Stage. --- Amelia.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Amelia.sh b/Amelia.sh index 2a19f1a..7eb6af6 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -1,7 +1,7 @@ #!/bin/bash # Amelia Installer -# Version: 4.3 +# Version: 4.4 set -euo pipefail trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR @@ -500,22 +500,22 @@ ${purple}###${nc} Locale Selection ${purple}###${nc} -Enter your Locale ${bwhite}(empty for 'en_US.UTF-8')${blue}: " +Enter your Locale ${bwhite}(empty for 'en_US.UTF-8 UTF-8')${blue}: " read -r -p " ==> " SETLOCALE if [[ -z "${SETLOCALE}" ]]; then - SETLOCALE="en_US.UTF-8" + SETLOCALE="en_US.UTF-8 UTF-8" sleep 0.5 YELLOW " - ### 'en_US.UTF-8' Locale has been selected + ### 'en_US.UTF-8 UTF-8' Locale has been selected " elif [[ "${SETLOCALE}" == "l" ]]; then more /usr/share/i18n/SUPPORTED return 1 - elif ! grep -q "^#\?$(sed 's/[].*[]/\\&/g' <<< "${SETLOCALE}") " /usr/share/i18n/SUPPORTED; then + elif ! grep -Fxq "${SETLOCALE}" /usr/share/i18n/SUPPORTED; then invalid return 1