RomanNum3ral
/
quickemu
mirror of https://github.com/quickemu-project/quickemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: correctly escape characters in edition/lang validation. Closes #1270

This commit is contained in:
Liam 2024-06-07 19:29:33 -07:00 committed by Martin Wimpress
parent a7271034cf
commit 9b1c28dbe1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quickget
View File

@ -199,7 +199,7 @@ function error_not_supported_release() {
} }
function error_not_supported_edition() { function error_not_supported_edition() {
if [[ ! "${EDITIONS[*]}" =~ ${EDITION} ]]; then if [[ ! "${EDITIONS[*]}" = *"${EDITION}"* ]]; then
echo -e "ERROR! ${EDITION} is not a supported $(pretty_name "${OS}") edition\n" echo -e "ERROR! ${EDITION} is not a supported $(pretty_name "${OS}") edition\n"
echo -n ' - Supported editions: ' echo -n ' - Supported editions: '
for EDITION in "${EDITIONS[@]}"; do for EDITION in "${EDITIONS[@]}"; do
@ -3483,8 +3483,6 @@ if [ -n "${2}" ]; then
if [[ $(type -t "editions_${OS}") == function ]]; then if [[ $(type -t "editions_${OS}") == function ]]; then
validate_release "releases_${OS}" validate_release "releases_${OS}"
EDITIONS=("$(editions_"${OS}")") EDITIONS=("$(editions_"${OS}")")
# Default to the first edition if none is specified.
EDITION=${EDITIONS[0]}
if [ -n "${3}" ]; then if [ -n "${3}" ]; then
EDITION="${3}" EDITION="${3}"
error_not_supported_edition error_not_supported_edition
@ -3512,7 +3510,7 @@ if [ -n "${2}" ]; then
"languages_${OS}" "languages_${OS}"
if [ -n "${3}" ]; then if [ -n "${3}" ]; then
I18N="${3}" I18N="${3}"
if [[ ! "${I18NS[*]}" =~ ${I18N} ]]; then if [[ ! "${I18NS[*]}" = *"${I18N}"* ]]; then
error_not_supported_lang error_not_supported_lang
fi fi
VM_PATH="$(echo "${OS}-${RELEASE}-${I18N// /-}" | tr -d '()')" VM_PATH="$(echo "${OS}-${RELEASE}-${I18N// /-}" | tr -d '()')"