From d03ff5c7ca829fce94f8d4bc9a2458e2b6a488d4 Mon Sep 17 00:00:00 2001 From: Hsiao-nan Cheung Date: Mon, 22 Jul 2019 10:34:09 +0800 Subject: [PATCH] Opt schema --- schema.json | 82 +++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 62 deletions(-) diff --git a/schema.json b/schema.json index f84392baf3..34bffc78ef 100644 --- a/schema.json +++ b/schema.json @@ -216,72 +216,30 @@ "type": "object" }, "autoupdate": { - "additionalProperties": false, - "properties": { - "architecture": { - "additionalProperties": false, - "properties": { - "32bit": { - "$ref": "#/definitions/autoupdateArch" - }, - "64bit": { - "$ref": "#/definitions/autoupdateArch" - } - }, - "type": "object" - }, - "url": { - "$ref": "#/definitions/autoupdateUriOrArrayOfAutoupdateUris" - }, - "hash": { - "$ref": "#/definitions/hashExtractionOrArrayOfHashExtractions" - }, - "extract_dir": { - "$ref": "#/definitions/stringOrArrayOfStrings" - }, - "extract_to": { - "$ref": "#/definitions/stringOrArrayOfStrings" - }, - "env_add_path": { - "$ref": "#/definitions/stringOrArrayOfStrings" - }, - "env_set": { - "type": "object" - }, - "bin": { - "$ref": "#/definitions/stringOrArrayOfStringsOrAnArrayOfArrayOfStrings" - }, - "shortcuts": { - "$ref": "#/definitions/shortcutsArray" - }, - "installer": { - "$ref": "#/definitions/installer" - }, - "post_install": { - "$ref": "#/definitions/stringOrArrayOfStrings" - }, - "pre_install": { - "$ref": "#/definitions/stringOrArrayOfStrings" - }, - "uninstaller": { - "$ref": "#/definitions/uninstaller" + "anyOf": [ + { + "$ref": "#/definitions/autoupdateArch" }, - "psmodule": { - "additionalProperties": false, + { "properties": { - "name": { - "type": "string" + "note": { + "$ref": "#/definitions/stringOrArrayOfStrings" + }, + "architecture": { + "type": "object", + "additionalProperties": false, + "properties": { + "32bit": { + "$ref": "#/definitions/autoupdateArch" + }, + "64bit": { + "$ref": "#/definitions/autoupdateArch" + } + } } - }, - "type": "object" - }, - "persist": { - "$ref": "#/definitions/stringOrArrayOfStringsOrAnArrayOfArrayOfStrings" - }, - "note": { - "$ref": "#/definitions/stringOrArrayOfStrings" + } } - }, + ], "type": "object" }, "checkver": {