fix: breaking changes for jq v1.8.0

Author: decipher3114

modules/json/cli.sh

@@ -128,7 +128,7 @@ parseJsonFromCLI() {
                                     elif $TYPE == $NUMBER then
                                         tonumber
                                     elif $TYPE == $BOOLEAN then
-                                        test("true")
+                                        toboolean
                                     elif $TYPE == $STRINGARRAY then
                                         (gsub("(?<a>([^,\\[\\] ]+))" ; "\"" + .a + "\"") | fromjson)
                                     end
@@ -142,7 +142,7 @@ parseJsonFromCLI() {
                             "key": $KEY,
                             "title": $TITLE,
                             "description": $DESCRIPTION,
-                            "required": ($REQUIRED | test("true")),
+                            "required": ($REQUIRED | toboolean),
                             "type": $TYPE,
                             "default": $DEFAULT,
                             "values": $ARGS.positional
@@ -163,7 +163,7 @@ parseJsonFromCLI() {
                     map(
                         if .pkgName == $PKG_NAME then
                             .patches |= (
-                                if ($USE | test("true")) then
+                                if ($USE | toboolean) then
                                     .recommended += [$PATCH_NAME]
                                 else
                                     .optional += [$PATCH_NAME]

modules/json/options.sh

@@ -238,7 +238,7 @@ editOptions() {
                                         null
                                     elif length == 1 then
                                         if $TYPE == $BOOLEAN then
-                                            .[0] | test("true")
+                                            .[0] | toboolean
                                         elif $TYPE == $NUMBER then
                                             .[0] | tonumber
                                         elif $TYPE == $STRING then

modules/json/patches.sh

@@ -75,6 +75,8 @@ managePatches() {
         esac
     done
 
+    clear
+
     UPDATED_PATCHES=$(
         jq -nc --arg PKG_NAME "$PKG_NAME" --argjson AVAILABLE_PATCHES "$AVAILABLE_PATCHES" --argjson ENABLED_PATCHES "$ENABLED_PATCHES" '
             [
@@ -91,30 +93,33 @@ managePatches() {
             map(
                 if .pkgName == $PKG_NAME then
                     .patches |= [$ARGS.positional | if (.[0] == "") then empty else .[] end] |
-                    .options |= . as $SAVED_OPTIONS | [
-                        $AVAILABLE_OPTIONS[] |
-                        . as $OPTION |
-                        .patchName as $PATCH_NAME |
-                        if ($ARGS.positional | index($PATCH_NAME)) != null then
-                            .title as $TITLE |
-                            .key as $KEY |
-                            .default as $DEFAULT |
-                            {
-                                "title": $TITLE,
-                                "patchName": $PATCH_NAME,
-                                "key": $KEY,
-                                "value": (($SAVED_OPTIONS[]? | select(.key == $KEY and .patchName == $PATCH_NAME) | .value) // $DEFAULT)
-                            }
-                        else
-                            empty
-                        end
-                    ]
+                    .options |= (
+                        . as $SAVED_OPTIONS | [
+                            $AVAILABLE_OPTIONS[] |
+                            . as $OPTION |
+                            .patchName as $PATCH_NAME |
+                            if ($ARGS.positional | index($PATCH_NAME)) != null then
+                                .title as $TITLE |
+                                .key as $KEY |
+                                .default as $DEFAULT |
+                                {
+                                    "title": $TITLE,
+                                    "patchName": $PATCH_NAME,
+                                    "key": $KEY,
+                                    "value": (($SAVED_OPTIONS[]? | select(.key == $KEY and .patchName == $PATCH_NAME) | .value) // $DEFAULT)
+                                }
+                            else
+                                empty
+                            end
+                        ]
+                    )
                 else
                     .
                 end
             )
         ' --args "${ENABLED_PATCHES_LIST[@]}"
     )
+
     echo "$UPDATED_PATCHES" > "$STORAGE/$SOURCE-patches.json"
     ENABLED_PATCHES="$UPDATED_PATCHES"
 }