mitsuo_makuda/linutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/linutil.git synced 2024-11-24 22:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Correct syntax for older jq versions

Browse Source
This commit is contained in:
Liam 2024-10-14 18:29:51 -07:00
parent 777e82df99
commit 8f689c4668
No known key found for this signature in database
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/tabs/utils/create-bootable-usb.sh
View File

@ -134,7 +134,8 @@ get_online_iso() {
# Download available operating systems, filter to to those that match requirements # Download available operating systems, filter to to those that match requirements
# Remove entries with more than 1 ISO or any other medium, they could cause issues # Remove entries with more than 1 ISO or any other medium, they could cause issues
OS_JSON="$(curl -L -s "$CONFIGURATION_URL" | jq -c "[.[] | \ OS_JSON="$(curl -L -s "$CONFIGURATION_URL" | jq -c "[.[] | \
.releases |= map(select(.arch // \"x86_64\" == "\"${ARCH}\"" \ .releases |= map(select( \
(.arch // \"x86_64\") == "\"${ARCH}\"" \
and (.iso | length == 1) and (.iso[0] | has(\"web\")) \ and (.iso | length == 1) and (.iso[0] | has(\"web\")) \
and .img == null and .fixed_iso == null and .floppy == null and .disk_images == null)) \ and .img == null and .fixed_iso == null and .floppy == null and .disk_images == null)) \
| select(.releases | length > 0)]")" | select(.releases | length > 0)]")"
@ -149,7 +150,7 @@ get_online_iso() {
printf "\n%b" "Select an operating system: " printf "\n%b" "Select an operating system: "
read -r OS read -r OS
OS_JSON="$(echo "${OS_JSON}" | jq -c '.[] | select(.name == '"\"${OS}\""')')" OS_JSON="$(echo "${OS_JSON}" | jq --arg os "${OS}" -c '.[] | select(.name == $os)')"
if [ -z "${OS_JSON}" ]; then if [ -z "${OS_JSON}" ]; then
printf "%b\n" "${RED}Invalid operating system selected.${RC}" printf "%b\n" "${RED}Invalid operating system selected.${RC}"
exit 1 exit 1
@ -162,7 +163,7 @@ get_online_iso() {
read -r RELEASE read -r RELEASE
printf "\n" printf "\n"
OS_JSON="$(echo "${OS_JSON}" | jq -c '.releases[] |= select(.release == '"\"${RELEASE}\""')')" OS_JSON="$(echo "${OS_JSON}" | jq --arg release "${RELEASE}" -c '.releases |= map(select(.release == $release))')"
if echo "${OS_JSON}" | jq -e '.releases | length == 0' >/dev/null; then if echo "${OS_JSON}" | jq -e '.releases | length == 0' >/dev/null; then
printf "%b\n" "${RED}Invalid release selected.${RC}" printf "%b\n" "${RED}Invalid release selected.${RC}"
exit 1 exit 1
@ -173,7 +174,7 @@ get_online_iso() {
echo "${OS_JSON}" | jq -r '.releases[].edition' | sort -Vur | tr '\n' ' ' echo "${OS_JSON}" | jq -r '.releases[].edition' | sort -Vur | tr '\n' ' '
printf "\n%b" "Select an edition: " printf "\n%b" "Select an edition: "
read -r EDITION read -r EDITION
ENTRY="$(echo "${OS_JSON}" | jq -c '.releases[] | select(.edition == '"\"${EDITION}\""')')" ENTRY="$(echo "${OS_JSON}" | jq --arg edition "${EDITION}" -c '.releases[] | select(.edition == $edition)')"
else else
ENTRY="$(echo "${OS_JSON}" | jq -c '.releases[0]')" ENTRY="$(echo "${OS_JSON}" | jq -c '.releases[0]')"
fi fi