From 9f5be6a2a11c7e1018dfcd49850d81f8c4c43f01 Mon Sep 17 00:00:00 2001 From: zen0bit Date: Mon, 29 Apr 2024 12:08:02 +0200 Subject: [PATCH 1/3] Add PRETTY_NAME variable --- quickget | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/quickget b/quickget index 7c82345..842b5b5 100755 --- a/quickget +++ b/quickget @@ -154,6 +154,7 @@ function show_os_info() { function pretty_name() { echo $(show_os_info -1 "${1}") } +PRETTY_NAME=$(show_os_info -1 "${OS}") # Just in case quickget want use it function os_homepage(){ @@ -234,7 +235,7 @@ function error_not_supported_release() { function error_not_supported_edition() { 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} edition\n" echo -n ' - Editions: ' for EDITION in "${EDITIONS[@]}"; do echo -n "${EDITION} " @@ -245,7 +246,7 @@ function error_not_supported_edition() { } 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} language\n" echo -n ' - Editions: ' for LANG in "${LANGS[@]}"; do echo -n "${LANG} " @@ -1222,7 +1223,7 @@ function web_get() { fi if [[ ${OS} != windows && ${OS} != macos && ${OS} != windows-server ]]; then - echo Downloading $(pretty_name "${OS}") ${RELEASE} ${EDITION:+ $EDITION} + echo Downloading ${PRETTY_NAME} ${RELEASE} ${EDITION:+ $EDITION} echo "- URL: ${URL}" fi @@ -1284,7 +1285,7 @@ function zsync_get() { echo "ERROR! Unable to create directory ${DIR}" exit 1 fi - echo -e Downloading $(pretty_name "${OS}") ${RELEASE} ${EDITION+ ${EDITION}} from ${URL}'\n' + echo -e Downloading ${PRETTY_NAME} ${RELEASE} ${EDITION+ ${EDITION}} from ${URL}'\n' # Only force http for zsync - not earlier because we might fall through here if ! zsync "${URL/https/http}.zsync" -i "${DIR}/${OUT}" -o "${DIR}/${OUT}" 2>/dev/null; then echo "ERROR! Failed to download ${URL/https/http}.zsync" @@ -1477,7 +1478,7 @@ EOF echo "secureboot=\"off\"" >> "${CONF_FILE}" fi fi - echo -e "\nTo start your $(pretty_name "${OS}") virtual machine run:" + echo -e "\nTo start your ${PRETTY_NAME} virtual machine run:" if [ ${OS} == "slint" ]; then echo -e " quickemu --vm ${CONF_FILE}\nTo start Slint with braille support run:\n quickemu --vm --braille --display sdl ${CONF_FILE}" else @@ -2538,7 +2539,7 @@ function get_ubuntu() { HASH=$(cut_1 <<<${DATA}) fi if [ -z $ISO ] || [ -z $HASH ]; then - echo "$(pretty_name $OS) ${RELEASE} is currently unavailable. Please select other OS/Release combination" + echo "${PRETTY_NAME} ${RELEASE} is currently unavailable. Please select other OS/Release combination" exit 1 fi if [[ "${RELEASE}" == "daily"* ]] || [ "${RELEASE}" == "dvd" ]; then @@ -3087,7 +3088,7 @@ function download_windows_server() { # Limit untrusted size for input validation iso_download_link="$(echo "$iso_download_link" | head -c 1024)" - echo "Downloading $(pretty_name "${OS}") ${PRETTY_RELEASE} (${LANG}): $iso_download_link" + echo "Downloading ${PRETTY_NAME} ${PRETTY_RELEASE} (${LANG}): $iso_download_link" # Use highest TLS version for endpoints that support it case "$iso_download_link" in From e34ad52f50cd920aae0c974b02e2433b2f4ea26a Mon Sep 17 00:00:00 2001 From: zen0bit Date: Mon, 29 Apr 2024 12:12:23 +0200 Subject: [PATCH 2/3] Change DISPLAY_NAME to PRETTY_NAME --- quickget | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/quickget b/quickget index 842b5b5..3923d04 100755 --- a/quickget +++ b/quickget @@ -226,7 +226,7 @@ function error_not_supported_os() { function error_not_supported_release() { if [[ ! " ${RELEASES[*]} " =~ " ${RELEASE} " ]]; then - echo -e "ERROR! ${DISPLAY_NAME} ${RELEASE} is not a supported release." + echo -e "ERROR! ${PRETTY_NAME} ${RELEASE} is not a supported release." echo -n 'Supported releases: ' "releases_${OS}" exit 1 @@ -274,11 +274,9 @@ function handle_missing() { } function validate_release() { - local DISPLAY_NAME="" + local PRETTY_NAME="" local RELEASE_GENERATOR="" local RELEASES="" - - DISPLAY_NAME="$(pretty_name "${OS}")" case ${OS} in *ubuntu-server*) RELEASE_GENERATOR="releases_ubuntu-server";; *ubuntu*) RELEASE_GENERATOR="releases_ubuntu";; @@ -296,15 +294,12 @@ function list_json() { function list_csv() { CSV_DATA="$(csv_data)" - - echo "Display Name,OS,Release,Option,Downloader,PNG,SVG" - sort -t',' -k2,2 <<<"${CSV_DATA}" - + sort -f <<<"${CSV_DATA}" exit 0 } function csv_data() { - local DISPLAY_NAME + local PRETTY_NAME local DL="" local DOWNLOADER local FUNC @@ -322,8 +317,8 @@ function csv_data() { for OS in $(os_support); do local EDITIONS="" - DISPLAY_NAME="$(pretty_name "${OS}")" - + echo "Pretty Name,OS,Release,Option,Downloader,PNG,SVG" + for OS in $(os_support); do case ${OS} in *ubuntu-server*) FUNC="ubuntu-server";; *ubuntu*) FUNC="ubuntu";; @@ -347,15 +342,15 @@ function csv_data() { # If the OS has an editions_() function, use it. if [[ ${EDITIONS} ]]; then for OPTION in ${EDITIONS}; do - echo "${DISPLAY_NAME},${OS},${RELEASE},${OPTION},${DOWNLOADER},${PNG},${SVG}" + echo "${PRETTY_NAME},${OS},${RELEASE},${OPTION},${DOWNLOADER},${PNG},${SVG}" done elif [[ "${OS}" == "windows"* ]]; then "languages_${OS}" for LANG in "${LANGS[@]}"; do - echo "${DISPLAY_NAME},${OS},${RELEASE},${LANG},${DOWNLOADER},${PNG},${SVG}" + echo "${PRETTY_NAME},${OS},${RELEASE},${LANG},${DOWNLOADER},${PNG},${SVG}" done else - echo "${DISPLAY_NAME},${OS},${RELEASE},,${DOWNLOADER},${PNG},${SVG}" + echo "${PRETTY_NAME},${OS},${RELEASE},,${DOWNLOADER},${PNG},${SVG}" fi done & done From 418aa23ea03fb0c85d1719d79df6a795b3434368 Mon Sep 17 00:00:00 2001 From: zen0bit Date: Mon, 29 Apr 2024 12:16:52 +0200 Subject: [PATCH 3/3] Remove unused pretty_name function --- quickget | 3 --- 1 file changed, 3 deletions(-) diff --git a/quickget b/quickget index 3923d04..5768d2a 100755 --- a/quickget +++ b/quickget @@ -151,9 +151,6 @@ function show_os_info() { done } -function pretty_name() { - echo $(show_os_info -1 "${1}") -} PRETTY_NAME=$(show_os_info -1 "${OS}") # Just in case quickget want use it