quickget: fix no more get_OS (etc) functions
This commit is contained in:
parent
ace60e7eb2
commit
6d189285c1
12
quickget
12
quickget
|
|
@ -108,8 +108,8 @@ function validate_release() {
|
||||||
|
|
||||||
DISPLAY_NAME="${PRETTY}"
|
DISPLAY_NAME="${PRETTY}"
|
||||||
case ${OS} in
|
case ${OS} in
|
||||||
*ubuntu-server*) RELEASE_GENERATOR="releases_ubuntu-server";;
|
*ubuntu-server*) RELEASE_GENERATOR="releases_";;
|
||||||
*ubuntu*) RELEASE_GENERATOR="releases_ubuntu";;
|
*ubuntu*) RELEASE_GENERATOR="releases_";;
|
||||||
*) RELEASE_GENERATOR="${1}";;
|
*) RELEASE_GENERATOR="${1}";;
|
||||||
esac
|
esac
|
||||||
RELEASES=$(${RELEASE_GENERATOR})
|
RELEASES=$(${RELEASE_GENERATOR})
|
||||||
|
|
@ -179,7 +179,7 @@ list_isos() {
|
||||||
for RELEASE in $(releases_ | sed -Ee 's/eol-\S+//g' ); do # hide eol releases
|
for RELEASE in $(releases_ | sed -Ee 's/eol-\S+//g' ); do # hide eol releases
|
||||||
# If the OS has an editions_() function, use it.
|
# If the OS has an editions_() function, use it.
|
||||||
if [[ $(type -t editions_) == function ]]; then
|
if [[ $(type -t editions_) == function ]]; then
|
||||||
for OPTION in $(editions_"${OS}"); do
|
for OPTION in $(editions_); do
|
||||||
URL=$(./quickget -u "${OS}" "${RELEASE}" "${OPTION}")
|
URL=$(./quickget -u "${OS}" "${RELEASE}" "${OPTION}")
|
||||||
if [ -z "${URL}" ]; then
|
if [ -z "${URL}" ]; then
|
||||||
echo "${OS}|${RELEASE}|${OPTION}|${URL}"
|
echo "${OS}|${RELEASE}|${OPTION}|${URL}"
|
||||||
|
|
@ -243,7 +243,7 @@ function csv_data() {
|
||||||
SVG="https://quickemu-project.github.io/quickemu-icons/svg/${FUNC}/${FUNC}-quickemu-white-pinkbg.svg"
|
SVG="https://quickemu-project.github.io/quickemu-icons/svg/${FUNC}/${FUNC}-quickemu-white-pinkbg.svg"
|
||||||
|
|
||||||
if [[ $(type -t editions_) == function ]]; then
|
if [[ $(type -t editions_) == function ]]; then
|
||||||
EDITIONS=$(editions_"${OS}")
|
EDITIONS=$(editions_)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for RELEASE in $(releases_); do
|
for RELEASE in $(releases_); do
|
||||||
|
|
@ -318,7 +318,7 @@ function test_all() {
|
||||||
. "actions/${OS}"
|
. "actions/${OS}"
|
||||||
for EDITION in $(editions_); do
|
for EDITION in $(editions_); do
|
||||||
validate_release releases_
|
validate_release releases_
|
||||||
URL=$(get_"${OS}" | cut -d' ' -f1 | head -n 1)
|
URL=$(get_ | cut -d' ' -f1 | head -n 1)
|
||||||
if [ "${OPERATION}" == "show" ]; then
|
if [ "${OPERATION}" == "show" ]; then
|
||||||
test_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}"
|
test_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}"
|
||||||
elif [ "${OPERATION}" == "test" ]; then
|
elif [ "${OPERATION}" == "test" ]; then
|
||||||
|
|
@ -347,7 +347,7 @@ function test_all() {
|
||||||
(get_)
|
(get_)
|
||||||
else
|
else
|
||||||
validate_release releases_
|
validate_release releases_
|
||||||
URL=$(get_"${OS}" | cut -d' ' -f1 | head -n 1)
|
URL=$(get_ | cut -d' ' -f1 | head -n 1)
|
||||||
if [ "${OPERATION}" == "show" ]; then
|
if [ "${OPERATION}" == "show" ]; then
|
||||||
test_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}"
|
test_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}"
|
||||||
elif [ "${OPERATION}" == "test" ]; then
|
elif [ "${OPERATION}" == "test" ]; then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue