fix: Readd renamed error_specify_edition function, cleanup

This commit is contained in:
zen0bit 2024-04-21 10:46:13 +02:00 committed by Martin Wimpress
parent 937f68e01f
commit d72f007b9c
1 changed files with 8 additions and 15 deletions

View File

@ -211,6 +211,13 @@ function error_specify_release() {
exit 1 exit 1
} }
function error_specify_edition() {
echo -en "ERROR! You must specify an edition.\n - Editions: "
#TODO ERROR here
"editions_${OS}"
exit 1
}
function error_not_supported_os() { function error_not_supported_os() {
echo -e "ERROR! ${OS} is not a supported OS.\n" echo -e "ERROR! ${OS} is not a supported OS.\n"
os_support | fold -s -w "$(tput cols)" os_support | fold -s -w "$(tput cols)"
@ -238,13 +245,6 @@ function error_not_supported_edition() {
fi fi
} }
os_error_edition() {
echo -en "ERROR! You must specify an edition.\n - Editions: "
#TODO ERROR here
"editions_${OS}"
exit 1
}
function error_not_supported_lang() { function error_not_supported_lang() {
echo -e "ERROR! ${LANG} is not a supported $(pretty_name "${OS}") language\n" echo -e "ERROR! ${LANG} is not a supported $(pretty_name "${OS}") language\n"
echo -n ' - Editions: ' echo -n ' - Editions: '
@ -3487,13 +3487,6 @@ fi
LANGS=() LANGS=()
os_error_edition() {
echo -en "ERROR! You must specify an edition.\n - Editions: "
#TODO ERROR here
"editions_${OS}"
exit 1
}
handle_missing() { handle_missing() {
# Handle odd missing Fedora combinations # Handle odd missing Fedora combinations
if [[ $OS == fedora ]] ; then if [[ $OS == fedora ]] ; then
@ -3575,7 +3568,7 @@ if [ -n "${2}" ]; then
EDITION="${3}" EDITION="${3}"
error_not_supported_edition error_not_supported_edition
else else
os_error_edition error_specify_edition
fi fi
handle_missing handle_missing
VM_PATH="${OS}-${RELEASE}-${EDITION}" VM_PATH="${OS}-${RELEASE}-${EDITION}"