From 1791c28ddb26f8e758d46fd64b63463f260decb2 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 1 May 2019 11:48:14 +0200 Subject: [PATCH 01/22] Add files via upload --- Engines/Wine/Verbs/atmlib/script.js | 50 +++++++++++++++++++++++++++ Engines/Wine/Verbs/atmlib/script.json | 11 ++++++ 2 files changed, 61 insertions(+) create mode 100644 Engines/Wine/Verbs/atmlib/script.js create mode 100644 Engines/Wine/Verbs/atmlib/script.json diff --git a/Engines/Wine/Verbs/atmlib/script.js b/Engines/Wine/Verbs/atmlib/script.js new file mode 100644 index 0000000000..8b8070d03c --- /dev/null +++ b/Engines/Wine/Verbs/atmlib/script.js @@ -0,0 +1,50 @@ +include("engines.wine.engine.object"); +include("utils.functions.net.resource"); +include("utils.functions.filesystem.files"); + +/** +* Verb to install atmlib +* @returns {Wine} Wine object +*/ +Wine.prototype.atmlib = function () { + var setupFile = new Resource() + .wizard(this.wizard()) + .url("https://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/win2000/Service_Packs/usa/W2KSP4_EN.EXE") + .checksum("fadea6d94a014b039839fecc6e6a11c20afa4fa8") + .name("W2ksp4_EN.exe") + .get(); + + new CabExtract() + .archive(setupFile) + .wizard(this.wizard()) + .to(this.system32directory()) + .extract(); + + new CabExtract() + .archive(this.system32directory() + "/i386/atmlib.dl_") + .wizard(this.wizard()) + .to(this.system32directory()) + .extract(); + + remove(this.system32directory() + "/i386/"); + + return this; +}; + +/** + * Verb to install atmlib +*/ +var verbImplementation = { + install: function (container) { + var wine = new Wine(); + wine.prefix(container); + var wizard = SetupWizard(InstallationType.VERBS, "atmlib", java.util.Optional.empty()); + wine.wizard(wizard); + wine.atmlib(); + wizard.close(); + } +}; + +/* exported Verb */ +var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); + diff --git a/Engines/Wine/Verbs/atmlib/script.json b/Engines/Wine/Verbs/atmlib/script.json new file mode 100644 index 0000000000..70cc4b033e --- /dev/null +++ b/Engines/Wine/Verbs/atmlib/script.json @@ -0,0 +1,11 @@ +{ + "scriptName" : "atmlib", + "id" : "engines.wine.verbs.atmlib", + "compatibleOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "testingOperatingSystems" : [], + "free" : true, + "requiresPatch" : false +} From 06e0d766e9c7643d107b261204eaefe03fab87a9 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 9 Jul 2019 13:47:18 +0200 Subject: [PATCH 02/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 73c85894e8..5d290a0dae 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -57,7 +57,8 @@ ZipScript.prototype.go = function () { .wizard(setupWizard) .archive(archive) .to(wine.prefixDirectory() + "/drive_c/" + this._name) - .extract(); + .extract() + .wine.run(); this._postInstall(wine, setupWizard); From 57aee0922a2095f1fdb1a6fd1a3b6af2d9021c1f Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 10 Jul 2019 20:54:37 +0200 Subject: [PATCH 03/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 5d290a0dae..b08adb8b7c 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -58,7 +58,7 @@ ZipScript.prototype.go = function () { .archive(archive) .to(wine.prefixDirectory() + "/drive_c/" + this._name) .extract() - .wine.run(); + .wine.runInsidePrefix(wine.prefixDirectory() + "/drive_c/" + this._name + ".exe"); this._postInstall(wine, setupWizard); From 027c79a5272ab5c9b58f6a927a7fe7924e558035 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Thu, 11 Jul 2019 08:40:25 +0200 Subject: [PATCH 04/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index b08adb8b7c..e3ebccaf3f 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -58,7 +58,7 @@ ZipScript.prototype.go = function () { .archive(archive) .to(wine.prefixDirectory() + "/drive_c/" + this._name) .extract() - .wine.runInsidePrefix(wine.prefixDirectory() + "/drive_c/" + this._name + ".exe"); + wine.runInsidePrefix(wine.prefixDirectory() + "/drive_c/" + this._name + ".exe"); this._postInstall(wine, setupWizard); From d829d0135732861cc60a6f571a865ca232ddd932 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sat, 10 Aug 2019 17:58:03 +0200 Subject: [PATCH 05/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index e3ebccaf3f..f3fffc9821 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -57,7 +57,8 @@ ZipScript.prototype.go = function () { .wizard(setupWizard) .archive(archive) .to(wine.prefixDirectory() + "/drive_c/" + this._name) - .extract() + .extract(); + wine.runInsidePrefix(wine.prefixDirectory() + "/drive_c/" + this._name + ".exe"); this._postInstall(wine, setupWizard); From baecf36c1091a03d48fccd24f520b7ba3c209ea6 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Fri, 6 Sep 2019 15:44:49 +0200 Subject: [PATCH 06/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 126 +++++++++--------- 1 file changed, 65 insertions(+), 61 deletions(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index f3fffc9821..f34f99ba97 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -1,72 +1,76 @@ -include("engines.wine.quick_script.quick_script"); -include("utils.functions.net.download"); -include("engines.wine.engine.object"); -include("utils.functions.filesystem.extract"); -include("engines.wine.verbs.luna"); - - -function ZipScript() { - QuickScript.call(this); -} - -ZipScript.prototype = Object.create(QuickScript.prototype); +const QuickScript = include("engines.wine.quick_script.quick_script"); +const Downloader = include("utils.functions.net.download"); +const Wine = include("engines.wine.engine.object"); +const {Extractor} = include("utils.functions.filesystem.extract"); -ZipScript.prototype.constructor = ZipScript; - -ZipScript.prototype.url = function (url) { - this._url = url; - return this; -}; - -ZipScript.prototype.checksum = function (checksum) { - this._checksum = checksum; - return this; -}; - -ZipScript.prototype.go = function () { - var setupWizard = SetupWizard(InstallationType.APPS, this._name, this.miniature()); +include("engines.wine.verbs.luna"); - setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); +module.default = class ZipScript extends QuickScript { + constructor() { + super(); + } - var wine = new Wine() - .wizard(setupWizard) - .prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion) - .create() - .luna() - .wait(); + url(url) { + this._url = url; + return this; + } + setupPathInsidePrefix(setupPath) { + this._setupPath = setupPath; + return this; + } + + checksum(checksum) { + this._checksum = checksum; + return this; + } - this._preInstall(wine, setupWizard); + go() { + const setupWizard = SetupWizard(InstallationType.APPS, this._name, this.miniature()); - // back to generic wait (might have been changed in preInstall) - setupWizard.wait(tr("Please wait...")); + setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); - var archive = ""; - if (!this._url) { - archive = setupWizard.browse(tr("Please select the .zip file."), wine.prefixDirectory(), ["zip"]); - } else { - archive = wine.prefixDirectory() + "/drive_c/archive.zip"; - new Downloader() + const wine = new Wine() .wizard(setupWizard) - .url(this._url) - .checksum(this._checksum) - .to(archive) - .get(); - } - - new Extractor() - .wizard(setupWizard) - .archive(archive) - .to(wine.prefixDirectory() + "/drive_c/" + this._name) - .extract(); - - wine.runInsidePrefix(wine.prefixDirectory() + "/drive_c/" + this._name + ".exe"); + .prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion) + .create() + .luna() + .wait(); + + this._preInstall(wine, setupWizard); + + // back to generic wait (might have been changed in preInstall) + setupWizard.wait(tr("Please wait...")); + + let archive = ""; + if (!this._url) { + archive = setupWizard.browse(tr("Please select the .zip file."), wine.prefixDirectory(), ["zip"]); + } else { + archive = wine.prefixDirectory() + "/drive_c/archive.zip"; + new Downloader() + .wizard(setupWizard) + .url(this._url) + .checksum(this._checksum) + .to(archive) + .get(); + } + + new Extractor() + .wizard(setupWizard) + .archive(archive) + .to(wine.prefixDirectory() + "/drive_c/" + this._name) + .extract(); + + if (this._setupPath !== 'undefined') { + wine.runInsidePrefix(this._setupPath); + } - this._postInstall(wine, setupWizard); + this._postInstall(wine, setupWizard); - this._createShortcut(wine.prefix()); + this._createShortcut(wine.prefix()); - // back to generic wait (might have been changed in postInstall) - setupWizard.wait(tr("Please wait...")); + // back to generic wait (might have been changed in postInstall) + setupWizard.wait(tr("Please wait...")); - setupWizard.close(); -}; + setupWizard.close(); + } +} From 0a85a89eb388730cd6dadb7b378dc162cdf7431e Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sat, 7 Sep 2019 11:56:19 +0200 Subject: [PATCH 07/22] Update script.js Add a file existence check. --- Engines/Wine/QuickScript/Zip Script/script.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index f34f99ba97..2361eca544 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -2,6 +2,7 @@ const QuickScript = include("engines.wine.quick_script.quick_script"); const Downloader = include("utils.functions.net.download"); const Wine = include("engines.wine.engine.object"); const {Extractor} = include("utils.functions.filesystem.extract"); +const {fileExists} = include("utils.functions.filesystem.files"); include("engines.wine.verbs.luna"); @@ -59,11 +60,12 @@ module.default = class ZipScript extends QuickScript { .archive(archive) .to(wine.prefixDirectory() + "/drive_c/" + this._name) .extract(); + if (fileExists(this._setupPath)){ + if (this._setupPath !== 'undefined') { + wine.runInsidePrefix(this._setupPath); + } + } - if (this._setupPath !== 'undefined') { - wine.runInsidePrefix(this._setupPath); - } - this._postInstall(wine, setupWizard); this._createShortcut(wine.prefix()); From 666824dff4746bc11d00da1f1c30956ec2bbf3fd Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sat, 7 Sep 2019 12:23:41 +0200 Subject: [PATCH 08/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 2361eca544..90be328190 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -60,11 +60,12 @@ module.default = class ZipScript extends QuickScript { .archive(archive) .to(wine.prefixDirectory() + "/drive_c/" + this._name) .extract(); - if (fileExists(this._setupPath)){ - if (this._setupPath !== 'undefined') { - wine.runInsidePrefix(this._setupPath); - } + if (!fileExists(this._setupPath)){ + throw tr("File not found"); } + if (this._setupPath !== 'undefined') { + wine.runInsidePrefix(this._setupPath); + } this._postInstall(wine, setupWizard); From 749eceaa34392ca53db2cb171eaadf7788e24c0c Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sat, 7 Sep 2019 16:06:55 +0200 Subject: [PATCH 09/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 90be328190..0e22f22382 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -61,7 +61,7 @@ module.default = class ZipScript extends QuickScript { .to(wine.prefixDirectory() + "/drive_c/" + this._name) .extract(); if (!fileExists(this._setupPath)){ - throw tr("File not found"); + throw new Error("File "this._setupPath" not found"); } if (this._setupPath !== 'undefined') { wine.runInsidePrefix(this._setupPath); From 5da905056f21adca6e755c540091899683aef62f Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sun, 8 Sep 2019 10:46:41 +0200 Subject: [PATCH 10/22] Update script.js Removed the redundant if --- Engines/Wine/QuickScript/Zip Script/script.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 0e22f22382..467f9e4fb1 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -63,9 +63,6 @@ module.default = class ZipScript extends QuickScript { if (!fileExists(this._setupPath)){ throw new Error("File "this._setupPath" not found"); } - if (this._setupPath !== 'undefined') { - wine.runInsidePrefix(this._setupPath); - } this._postInstall(wine, setupWizard); From 6ec6940c1432bce866f9a479b1c04fe0cce6c6ce Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sun, 8 Sep 2019 12:07:19 +0200 Subject: [PATCH 11/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 467f9e4fb1..8535c48ba9 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -60,9 +60,11 @@ module.default = class ZipScript extends QuickScript { .archive(archive) .to(wine.prefixDirectory() + "/drive_c/" + this._name) .extract(); - if (!fileExists(this._setupPath)){ - throw new Error("File "this._setupPath" not found"); - } + if (this._setupPath !== `undefined`){ + if (!fileExists(this._setupPath)){ + throw new Error "Hello There" + } + } this._postInstall(wine, setupWizard); From 2148eaed113b997a6fa61a7ce7dac67a9a50b67e Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 8 Sep 2019 16:56:11 +0200 Subject: [PATCH 12/22] General Kenobi --- Engines/Wine/QuickScript/Zip Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 8535c48ba9..4c7007c6ad 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -62,7 +62,7 @@ module.default = class ZipScript extends QuickScript { .extract(); if (this._setupPath !== `undefined`){ if (!fileExists(this._setupPath)){ - throw new Error "Hello There" + throw new Error(tr("File \"{0}\" not found", this._setupPath)); } } From 5c8e180967ecbe06938aa0aebde1dfe8bd15f76e Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 8 Sep 2019 17:05:50 +0200 Subject: [PATCH 13/22] Codacy I see you --- Engines/Wine/QuickScript/Zip Script/script.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index d4673a892c..73be4cce79 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -15,10 +15,11 @@ module.default = class ZipScript extends QuickScript { this._url = url; return this; } + setupPathInsidePrefix(setupPath) { - this._setupPath = setupPath; - return this; - } + this._setupPath = setupPath; + return this; + } checksum(checksum) { this._checksum = checksum; @@ -61,8 +62,8 @@ module.default = class ZipScript extends QuickScript { .to(wine.prefixDirectory() + "/drive_c/" + this._name) .extract(); - if (this._setupPath !== `undefined`){ - if (!fileExists(this._setupPath)){ + if (this._setupPath !== `undefined`) { + if (!fileExists(this._setupPath)) { throw new Error(tr("File \"{0}\" not found", this._setupPath)); } } @@ -77,4 +78,4 @@ module.default = class ZipScript extends QuickScript { setupWizard.close(); } -} \ No newline at end of file +} From c415e389f7873ee3a2e76b0797aa1ac171a2c446 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 8 Sep 2019 17:06:25 +0200 Subject: [PATCH 14/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 73be4cce79..1ffb0f05f0 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -67,7 +67,6 @@ module.default = class ZipScript extends QuickScript { throw new Error(tr("File \"{0}\" not found", this._setupPath)); } } - this._postInstall(wine, setupWizard); From ef3a19f57ad737069e38dbf78b5fd3aa4f14ef55 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 8 Sep 2019 17:07:43 +0200 Subject: [PATCH 15/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 1ffb0f05f0..ddb84b4fca 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -65,6 +65,8 @@ module.default = class ZipScript extends QuickScript { if (this._setupPath !== `undefined`) { if (!fileExists(this._setupPath)) { throw new Error(tr("File \"{0}\" not found", this._setupPath)); + } else { + wine.runInsidePrefix(this._setupPath); } } From e322983cb6bd813d1aa25e31c57cc8a7cbafbb23 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 16:31:47 +0200 Subject: [PATCH 16/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index ddb84b4fca..280e597f5e 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -63,7 +63,7 @@ module.default = class ZipScript extends QuickScript { .extract(); if (this._setupPath !== `undefined`) { - if (!fileExists(this._setupPath)) { + if (!fileExists(this.prefixDirectory() + "/drive_c/" + this._setupPath)) { throw new Error(tr("File \"{0}\" not found", this._setupPath)); } else { wine.runInsidePrefix(this._setupPath); From 4bf96c752fb0834a04c11bf3d6f69d27b42a39f8 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 11 Sep 2019 21:03:30 +0200 Subject: [PATCH 17/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 1151fcb57f..1f7d9826d4 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -4,7 +4,6 @@ const Wine = include("engines.wine.engine.object"); const {Extractor} = include("utils.functions.filesystem.extract"); const {fileExists} = include("utils.functions.filesystem.files"); - const Luna = include("engines.wine.verbs.luna"); module.default = class ZipScript extends QuickScript { @@ -68,9 +67,8 @@ module.default = class ZipScript extends QuickScript { if (this._setupPath !== `undefined`) { if (!fileExists(this.prefixDirectory() + "/drive_c/" + this._setupPath)) { throw new Error(tr("File \"{0}\" not found", this._setupPath)); - } else { - wine.runInsidePrefix(this._setupPath); - } + } + wine.runInsidePrefix(this._setupPath); } this._postInstall(wine, setupWizard); From 02c1e6d2de2ea0aea76b719beb05500e6f5ffb83 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sun, 15 Sep 2019 14:29:55 +0200 Subject: [PATCH 18/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 1f7d9826d4..fd8ad8720b 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -67,7 +67,7 @@ module.default = class ZipScript extends QuickScript { if (this._setupPath !== `undefined`) { if (!fileExists(this.prefixDirectory() + "/drive_c/" + this._setupPath)) { throw new Error(tr("File \"{0}\" not found", this._setupPath)); - } + } wine.runInsidePrefix(this._setupPath); } From 7ff3d8875ab7b7cc7dd73c965812e93f4cd8d328 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Thu, 3 Oct 2019 21:03:57 +0200 Subject: [PATCH 19/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index fd8ad8720b..ec2266ab5d 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -16,6 +16,11 @@ module.default = class ZipScript extends QuickScript { return this; } + /** + * If setupPath is provided, ZipScript will try to execute the .exe when the archive is extracted + * + * @param {string} setupPath path of the setup in /drive_c/ + */ setupPathInsidePrefix(setupPath) { this._setupPath = setupPath; return this; From a10bce96156be311e0cb42777396725b0c4bdbf5 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Thu, 3 Oct 2019 21:31:03 +0200 Subject: [PATCH 20/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index ec2266ab5d..203a2bf1b0 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -17,9 +17,10 @@ module.default = class ZipScript extends QuickScript { } /** - * If setupPath is provided, ZipScript will try to execute the .exe when the archive is extracted + * If setupPath is provided, ZipScript will try to execute the .exe when the archive is extracted * * @param {string} setupPath path of the setup in /drive_c/ + * @returns {ZipScript} This */ setupPathInsidePrefix(setupPath) { this._setupPath = setupPath; @@ -54,7 +55,7 @@ module.default = class ZipScript extends QuickScript { if (!this._url) { archive = setupWizard.browse(tr("Please select the .zip file."), wine.prefixDirectory(), ["zip"]); } else { - archive = wine.prefixDirectory() + "/drive_c/archive.zip"; + archive = `${wine.prefixDirectory()}/drive_c/archive.zip`; new Downloader() .wizard(setupWizard) .url(this._url) @@ -70,7 +71,7 @@ module.default = class ZipScript extends QuickScript { .extract(); if (this._setupPath !== `undefined`) { - if (!fileExists(this.prefixDirectory() + "/drive_c/" + this._setupPath)) { + if (!fileExists(`${wine.prefixDirectory()}/drive_c/${this._setupPath}`)) { throw new Error(tr("File \"{0}\" not found", this._setupPath)); } wine.runInsidePrefix(this._setupPath); From 4702470cb864c25ef0c13fd8eebfa0e51b7bf77c Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sat, 5 Oct 2019 11:15:55 +0200 Subject: [PATCH 21/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 203a2bf1b0..7765ad93bf 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -67,7 +67,7 @@ module.default = class ZipScript extends QuickScript { new Extractor() .wizard(setupWizard) .archive(archive) - .to(wine.prefixDirectory() + "/drive_c/" + this._name) + .to(`${wine.prefixDirectory()}/drive_c/${this._name}`) .extract(); if (this._setupPath !== `undefined`) { From 6fad2979826818f3a460c5ec40cd1bca781c33fb Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 6 Oct 2019 13:36:18 +0200 Subject: [PATCH 22/22] Update script.js --- Engines/Wine/QuickScript/Zip Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Zip Script/script.js b/Engines/Wine/QuickScript/Zip Script/script.js index 7765ad93bf..71919eba01 100644 --- a/Engines/Wine/QuickScript/Zip Script/script.js +++ b/Engines/Wine/QuickScript/Zip Script/script.js @@ -70,7 +70,7 @@ module.default = class ZipScript extends QuickScript { .to(`${wine.prefixDirectory()}/drive_c/${this._name}`) .extract(); - if (this._setupPath !== `undefined`) { + if (this._setupPath !== undefined) { if (!fileExists(`${wine.prefixDirectory()}/drive_c/${this._setupPath}`)) { throw new Error(tr("File \"{0}\" not found", this._setupPath)); }