Make Windows LANGS consistent with other OS EDITIONS

This commit is contained in:
Martin Wimpress 2022-02-21 10:11:25 +00:00
parent 6ddf92c772
commit 344c7f93a5
No known key found for this signature in database
GPG Key ID: 61DF940515E06DA3
1 changed files with 15 additions and 16 deletions

View File

@ -449,6 +449,12 @@ function releases_void() {
xfce-musl xfce-musl
} }
function releases_windows() {
echo 8 \
10 \
11
}
function languages_windows() { function languages_windows() {
LANGS=(Arabic LANGS=(Arabic
"Brazilian Portuguese" "Brazilian Portuguese"
@ -490,13 +496,6 @@ function languages_windows() {
Ukrainian) Ukrainian)
} }
function releases_windows() {
echo 8 \
10 \
11
}
function releases_zorin() { function releases_zorin() {
echo 16core64 \ echo 16core64 \
16lite64 \ 16lite64 \
@ -1884,7 +1883,7 @@ if [ -n "${2}" ]; then
# If the OS has an editions_() function, use it. # If the OS has an editions_() function, use it.
if [[ $(type -t "editions_${OS}") == function ]]; then if [[ $(type -t "editions_${OS}") == function ]]; then
EDITIONS=($(editions_${OS})) EDITIONS=("$(editions_"${OS}")")
EDITION=${EDITIONS[0]} EDITION=${EDITIONS[0]}
if [ -n "${3}" ]; then if [ -n "${3}" ]; then
EDITION="${3}" EDITION="${3}"
@ -1897,24 +1896,24 @@ if [ -n "${2}" ]; then
fi fi
fi fi
VM_PATH="${OS}-${RELEASE}-${EDITION}" VM_PATH="${OS}-${RELEASE}-${EDITION}"
get_${OS} "${EDITION}" get_"${OS}" "${EDITION}"
elif [[ "${OS}" == *"ubuntu"* ]]; then elif [[ "${OS}" == *"ubuntu"* ]]; then
get_ubuntu get_ubuntu
elif [ "${OS}" == "windows" ]; then elif [ "${OS}" == "windows" ]; then
LANG_NAME="English International" LANG="English International"
if [ -n "${3}" ]; then if [ -n "${3}" ]; then
LANG_NAME="${3}" EDITION="${3}"
if [[ ! ${LANGS[*]} =~ "${LANG_NAME}" ]]; then if [[ ! ${LANGS[*]} =~ "${LANG}" ]]; then
echo -e "ERROR! ${LANG_NAME} is not a supported Windows language:\n" echo -e "ERROR! ${LANG} is not a supported Windows language:\n"
for LANG in "${LANGS[@]}"; do for LANG in "${LANGS[@]}"; do
echo -n "${LANG} " echo -n "${LANG} "
done done
exit 1 exit 1
fi fi
fi fi
get_windows "${LANG_NAME}" get_windows "${LANG}"
else else
get_"${OS}" get_"${OS}"
fi fi
else else
echo -n "ERROR! You must specify a release: " echo -n "ERROR! You must specify a release: "