Compare commits

..

2 Commits

Author SHA1 Message Date
Liam
2b43b21e37
Merge df55f743d7 into 79eb752552 2024-10-20 00:52:18 +00:00
Liam
df55f743d7
fix: List available options in a more readable way.
Co-authored-by: adamperkowski <adamperkowski@users.noreply.github.com>
2024-10-19 17:51:54 -07:00

View File

@ -125,6 +125,10 @@ get_architecture() {
esac esac
} }
comma_delimited_list() {
echo "${1}" | tr '\n' ',' | sed 's/,/, /g; s/, $//'
}
get_online_iso() { get_online_iso() {
get_architecture get_architecture
printf "%b\n" "${YELLOW}Fetching available operating systems...${RC}" printf "%b\n" "${YELLOW}Fetching available operating systems...${RC}"
@ -145,7 +149,7 @@ get_online_iso() {
fi fi
printf "%b\n" "${YELLOW}Available Operating Systems:${RC}" printf "%b\n" "${YELLOW}Available Operating Systems:${RC}"
echo "${OS_JSON}" | jq -r '.[].name' | tr '\n' ' ' comma_delimited_list "$(echo "${OS_JSON}" | jq -r '.[].name')"
printf "\n%b" "Select an operating system: " printf "\n%b" "Select an operating system: "
read -r OS read -r OS
@ -157,7 +161,7 @@ get_online_iso() {
PRETTY_NAME="$(echo "${OS_JSON}" | jq -r '.pretty_name')" PRETTY_NAME="$(echo "${OS_JSON}" | jq -r '.pretty_name')"
printf "\n%b\n" "${YELLOW}Available releases for ${PRETTY_NAME}:${RC}" printf "\n%b\n" "${YELLOW}Available releases for ${PRETTY_NAME}:${RC}"
echo "${OS_JSON}" | jq -r '.releases[].release' | sort -Vur | tr '\n' ' ' comma_delimited_list "$(echo "${OS_JSON}" | jq -r '.releases[].release' | sort -Vur)"
printf "\n%b" "Select a release: " printf "\n%b" "Select a release: "
read -r RELEASE read -r RELEASE
printf "\n" printf "\n"
@ -170,7 +174,7 @@ get_online_iso() {
if echo "${OS_JSON}" | jq -e '.releases[] | select(.edition != null) | any' >/dev/null; then if echo "${OS_JSON}" | jq -e '.releases[] | select(.edition != null) | any' >/dev/null; then
printf "%b\n" "${YELLOW}Available editions for ${PRETTY_NAME} ${RELEASE}:${RC}" printf "%b\n" "${YELLOW}Available editions for ${PRETTY_NAME} ${RELEASE}:${RC}"
echo "${OS_JSON}" | jq -r '.releases[].edition' | sort -Vur | tr '\n' ' ' comma_delimited_list "$(echo "${OS_JSON}" | jq -r '.releases[].edition' | sort -Vur)"
printf "\n%b" "Select an edition: " printf "\n%b" "Select an edition: "
read -r EDITION read -r EDITION
ENTRY="$(echo "${OS_JSON}" | jq --arg edition "${EDITION}" -c '.releases[] | select(.edition == $edition)')" ENTRY="$(echo "${OS_JSON}" | jq --arg edition "${EDITION}" -c '.releases[] | select(.edition == $edition)')"