fix: Readd renamed error_not_supported_editions function, cleanup
This commit is contained in:
parent
c5ec090970
commit
370d7d5843
16
quickget
16
quickget
|
@ -221,7 +221,7 @@ function error_not_supported_os() {
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
os_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 ' - Editions: '
|
echo -n ' - Editions: '
|
||||||
|
@ -3555,18 +3555,6 @@ os_supported_release() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
os_supported_edition() {
|
|
||||||
if [[ ! " ${EDITIONS[*]} " =~ " ${EDITION} " ]]; then
|
|
||||||
echo -e "ERROR! ${EDITION} is not a supported $(pretty_name "${OS}") edition\n"
|
|
||||||
echo -n ' - Editions: '
|
|
||||||
for EDITION in "${EDITIONS[@]}"; do
|
|
||||||
echo -n "${EDITION} "
|
|
||||||
done
|
|
||||||
echo ""
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
os_error_edition() {
|
os_error_edition() {
|
||||||
echo -en "ERROR! You must specify an edition.\n - Editions: "
|
echo -en "ERROR! You must specify an edition.\n - Editions: "
|
||||||
#TODO ERROR here
|
#TODO ERROR here
|
||||||
|
@ -3746,7 +3734,7 @@ if [ -n "${2}" ]; then
|
||||||
EDITION=${EDITIONS[0]}
|
EDITION=${EDITIONS[0]}
|
||||||
if [ -n "${3}" ]; then
|
if [ -n "${3}" ]; then
|
||||||
EDITION="${3}"
|
EDITION="${3}"
|
||||||
os_supported_edition
|
error_not_supported_edition
|
||||||
else
|
else
|
||||||
os_error_edition
|
os_error_edition
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue