From 00af0dee8dc79193ae41b1e6853125b23b369d4e Mon Sep 17 00:00:00 2001 From: "G.Reijn" Date: Sun, 15 Dec 2024 14:26:30 +0100 Subject: [PATCH 1/4] Add missing setting in schema --- schemas/JSON/settings/settings.schema.0.2.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json index f2638f417f..f65deca7fc 100644 --- a/schemas/JSON/settings/settings.schema.0.2.json +++ b/schemas/JSON/settings/settings.schema.0.2.json @@ -184,6 +184,11 @@ "type": "integer", "default": 3, "minimum": 1 + }, + "extractArchiveWithTar": { + "description": "Controls the use of tar.exe for extracting packages.", + "type": "boolean", + "default": false } } }, From a9d7d5ab1ad39cb5ae0406b9f96df41d377e2755 Mon Sep 17 00:00:00 2001 From: "G.Reijn" Date: Sun, 15 Dec 2024 16:07:52 +0100 Subject: [PATCH 2/4] update setting --- schemas/JSON/settings/settings.schema.0.2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json index f65deca7fc..663fd58812 100644 --- a/schemas/JSON/settings/settings.schema.0.2.json +++ b/schemas/JSON/settings/settings.schema.0.2.json @@ -185,7 +185,7 @@ "default": 3, "minimum": 1 }, - "extractArchiveWithTar": { + "archiveExtractionMethod": { "description": "Controls the use of tar.exe for extracting packages.", "type": "boolean", "default": false From 6cefead8fbb88cf53d8404fca77952ffd155fe52 Mon Sep 17 00:00:00 2001 From: "G.Reijn" Date: Sun, 15 Dec 2024 16:09:30 +0100 Subject: [PATCH 3/4] Add quotes in settings --- doc/Settings.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/Settings.md b/doc/Settings.md index 027c0066ab..cc314ac21b 100644 --- a/doc/Settings.md +++ b/doc/Settings.md @@ -114,7 +114,8 @@ The 'skipDependencies' behavior affects whether dependencies are installed for a ``` ### Archive Extraction Method -The 'archiveExtractionMethod' behavior affects how installer archives are extracted. Currently there are two supported values: `Tar` or `ShellApi`. + +The `archiveExtractionMethod` behavior affects how installer archives are extracted. Currently there are two supported values: `Tar` or `ShellApi`. `Tar` indicates that the archive should be extracted using the tar executable ('tar.exe') while `shellApi` indicates using the Windows Shell API. Defaults to `shellApi` if value is not set or is invalid. ```json From 3077320778133e828dc144edefc996b00139a115 Mon Sep 17 00:00:00 2001 From: "G.Reijn" Date: Sun, 15 Dec 2024 17:06:35 +0100 Subject: [PATCH 4/4] Solve remarks Trenly --- schemas/JSON/settings/settings.schema.0.2.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json index 663fd58812..566e346bf1 100644 --- a/schemas/JSON/settings/settings.schema.0.2.json +++ b/schemas/JSON/settings/settings.schema.0.2.json @@ -187,8 +187,12 @@ }, "archiveExtractionMethod": { "description": "Controls the use of tar.exe for extracting packages.", - "type": "boolean", - "default": false + "type": "string", + "enum": [ + "shellApi", + "tar" + ], + "default": "shellApi" } } },