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

fix: Correctly throw errors when an invalid option is passed (#1560) 

* fix: Correctly throw errors when a parameter is not fully matched
This commit is contained in:
Liam 2025-02-01 08:39:48 -06:00 committed by GitHub
parent 70b531c463
commit f87cc613ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
quickget
View File

@ -146,7 +146,7 @@ function error_specify_os() {
} }
function os_supported() { function os_supported() {
if [[ ! "$(os_support)" =~ ${OS} ]]; then if [[ ! " $(os_support) " =~ \ "${OS}"\ ]]; then
echo -e "ERROR! ${OS} is not a supported OS.\n" echo -e "ERROR! ${OS} is not a supported OS.\n"
os_support | fmt -w 80 os_support | fmt -w 80
exit 1 exit 1
@ -185,7 +185,7 @@ function error_specify_release() {
} }
function error_not_supported_release() { function error_not_supported_release() {
if [[ ! "${RELEASES[*]}" =~ ${RELEASE} ]]; then if [[ ! " ${RELEASES[*]} " =~ \ "${RELEASE}"\ ]]; then
echo -e "ERROR! ${DISPLAY_NAME} ${RELEASE} is not a supported release.\n" echo -e "ERROR! ${DISPLAY_NAME} ${RELEASE} is not a supported release.\n"
echo -n ' - Supported releases: ' echo -n ' - Supported releases: '
"releases_${OS}" "releases_${OS}"
@ -209,6 +209,17 @@ function error_not_supported_argument() {
exit 1 exit 1
} }
function is_valid_language() {
local I18N=""
local PASSED_I18N="${1}"
for I18N in "${I18NS[@]}"; do
if [[ "${I18N}" == "${PASSED_I18N}" ]]; then
return 0
fi
done
return 1
}
function handle_missing() { function handle_missing() {
# Handle odd missing Fedora combinations # Handle odd missing Fedora combinations
case "${OS}" in case "${OS}" in
@ -3591,7 +3602,7 @@ if [ -n "${2}" ]; then
EDITIONS=("$(editions_"${OS}")") EDITIONS=("$(editions_"${OS}")")
if [ -n "${3}" ]; then if [ -n "${3}" ]; then
EDITION="${3}" EDITION="${3}"
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
@ -3627,7 +3638,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 ! is_valid_language "${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 '()')"