From e63dfdd8b13f7a4ce386cca93a9556d74cbb1a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Tue, 16 Apr 2024 10:12:11 +0800
Subject: [PATCH] Packages: fix parsing of JSON config; fix wording of
 json_schema

---
 doc/json_schema.json            | 32 +++++++++++++++++++++++++++++---
 src/modules/packages/packages.c |  1 +
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/doc/json_schema.json b/doc/json_schema.json
index b3b413052..387fda5ed 100644
--- a/doc/json_schema.json
+++ b/doc/json_schema.json
@@ -1576,9 +1576,35 @@
                                         "description": "List installed package managers and count of installed packages"
                                     },
                                     "disabled": {
-                                        "description": "A colon separated list of package managers to be disabled when detecting",
-                                        "type": "string",
-                                        "default": "winget"
+                                        "description": "List of package managers to be disabled when detecting",
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string",
+                                            "enum": [
+                                                "am",
+                                                "apk",
+                                                "brew",
+                                                "choco",
+                                                "dpkg",
+                                                "emerge",
+                                                "eopkg",
+                                                "flatpak",
+                                                "macports",
+                                                "nix",
+                                                "opkg",
+                                                "pacman",
+                                                "paludis",
+                                                "pkg",
+                                                "pkgtool",
+                                                "rpm",
+                                                "scoop",
+                                                "snap",
+                                                "winget",
+                                                "xbps"
+                                            ],
+                                            "uniqueItems": true
+                                        },
+                                        "default": ["winget"]
                                     },
                                     "key": {
                                         "$ref": "#/$defs/key"
diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
index 7a3c38e7d..843f620c6 100644
--- a/src/modules/packages/packages.c
+++ b/src/modules/packages/packages.c
@@ -276,6 +276,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module)
                     }
                     #undef FF_TEST_PACKAGE_NAME
                 }
+                continue;
             }
         }