Merge 30f34d85e4 into 79eb752552

core/tabs/utils/create-bootable-usb.sh

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