From 18f19c644b532a69eb342a687d22f5418cd79717 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Tue, 20 Oct 2020 01:01:45 +0000 Subject: [PATCH] allow any UTF8 during install --- install.sh | 8 ++++---- restore.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/install.sh b/install.sh index d2f9f6aa..09fc028f 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION="13" +SCRIPT_VERSION="14" SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/develop/install.sh' GREEN='\033[0;32m' @@ -33,9 +33,9 @@ if [ $EUID -eq 0 ]; then exit 1 fi -if [ "$LANG" != "en_US.UTF-8" ]; then - printf >&2 "\n${RED}System locale must be ${GREEN}en_US.UTF-8${RED} not ${YELLOW}${LANG}${NC}\n" - printf >&2 "${RED}Run the following command and change the default locale to ${GREEN}en_US.UTF-8${NC}\n\n" +if [[ "$LANG" != *".UTF-8" ]]; then + printf >&2 "\n${RED}System locale must be ${GREEN}.UTF-8${RED} not ${YELLOW}${LANG}${NC}\n" + printf >&2 "${RED}Run the following command and change the default locale to your language of choice${NC}\n\n" printf >&2 "${GREEN}sudo dpkg-reconfigure locales${NC}\n\n" printf >&2 "${RED}You will need to log out and back in for changes to take effect, then re-run this script.${NC}\n\n" exit 1 diff --git a/restore.sh b/restore.sh index d5a1197d..9a8a50d7 100755 --- a/restore.sh +++ b/restore.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION="2" +SCRIPT_VERSION="3" SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/develop/restore.sh' GREEN='\033[0;32m' @@ -33,9 +33,9 @@ if [ $EUID -eq 0 ]; then exit 1 fi -if [ "$LANG" != "en_US.UTF-8" ]; then - printf >&2 "\n${RED}System locale must be ${GREEN}en_US.UTF-8${RED} not ${YELLOW}${LANG}${NC}\n" - printf >&2 "${RED}Run the following command and change the default locale to ${GREEN}en_US.UTF-8${NC}\n\n" +if [[ "$LANG" != *".UTF-8" ]]; then + printf >&2 "\n${RED}System locale must be ${GREEN}.UTF-8${RED} not ${YELLOW}${LANG}${NC}\n" + printf >&2 "${RED}Run the following command and change the default locale to your language of choice${NC}\n\n" printf >&2 "${GREEN}sudo dpkg-reconfigure locales${NC}\n\n" printf >&2 "${RED}You will need to log out and back in for changes to take effect, then re-run this script.${NC}\n\n" exit 1