From 86fd07c3fc124698e868509b2123884b2e8c3bfa Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Mon, 28 Aug 2017 15:32:29 +0200 Subject: [PATCH 01/12] Update script.js --- Applications/Games/Hearthstone/Online/script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Applications/Games/Hearthstone/Online/script.js b/Applications/Games/Hearthstone/Online/script.js index a7998c4920..a5feeb11ca 100644 --- a/Applications/Games/Hearthstone/Online/script.js +++ b/Applications/Games/Hearthstone/Online/script.js @@ -5,11 +5,11 @@ include(["Engines", "Wine", "Verbs", "corefonts"]); new OnlineInstallerScript() .name("Hearthstone") .editor("Blizzard") - .applicationHomepage("http://eu.battle.net/en/app/") + .applicationHomepage("https://eu.battle.net/hearthstone/") .author("ImperatorS79") - .url("https://www.battle.net/download/getInstallerForGame?os=win&locale=enGB&version=LIVE&gameProgram=BATTLENET_APP.exe") + .url("https://eu.battle.net/download/getInstaller?os=win&installer=Hearthstone-Setup.exe") .category("Games") - .executable("Battle.net.exe") + .executable("Hearthstone.exe") .wineVersion("2.15") .wineDistribution("staging") .preInstall(function(wine, wizard) { From 10d49cf24ddd6eb1da42e0bf3858ed3d4bf22581 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sat, 12 Jan 2019 12:35:47 +0100 Subject: [PATCH 02/12] Add files via upload --- Engines/Wine/Verbs/FAudio/script.js | 44 +++++++++++++++++++++++++++ Engines/Wine/Verbs/FAudio/script.json | 12 ++++++++ 2 files changed, 56 insertions(+) create mode 100644 Engines/Wine/Verbs/FAudio/script.js create mode 100644 Engines/Wine/Verbs/FAudio/script.json diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js new file mode 100644 index 0000000000..5068b3e12f --- /dev/null +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -0,0 +1,44 @@ +include(["engines", "wine", "engine", "object"]); +include(["engines", "wine", "plugins", "override_dll"]); +include(["utils", "functions", "net", "resource"]); +include(["utils", "functions", "filesystem", "files"]); + +/** +* Verb to install FAudio +* see: https://github.com/Kron4ek/FAudio-Builds +* @returns {Wine} Wine object +*/ +Wine.prototype.faudio = function () { + var setupFile = new Resource() + .wizard(this.wizard()) + .url("https://github.com/Kron4ek/FAudio-Builds/releases/download/19.01/faudio-19.01.tar.xz") + .name("faudio-19.01.tar.xz") + .get(); + + new Extractor() + .wizard(this.wizard()) + .archive(setupFile) + .to(this.prefixDirectory() + "/FAudio/") + .extract(); + + this.runInsidePrefix("/FAudio/faudio-19.01/wine_setup_faudio.sh") + + return this; +} + +/** + * Verb to install FAudio +*/ +var verbImplementation = { + install: function (container) { + var wine = new Wine(); + wine.prefix(container); + var wizard = SetupWizard(InstallationType.VERBS, "FAudio", java.util.Optional.empty()); + wine.wizard(wizard); + wine.faudio(); + wizard.close(); + } +}; + +/* exported Verb */ +var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); diff --git a/Engines/Wine/Verbs/FAudio/script.json b/Engines/Wine/Verbs/FAudio/script.json new file mode 100644 index 0000000000..ddd7e26bbd --- /dev/null +++ b/Engines/Wine/Verbs/FAudio/script.json @@ -0,0 +1,12 @@ +{ + "scriptName" : "faudio", + "id" : "faudio", + "compatibleOperatingSystems" : [ + "LINUX" + ], + "testingOperatingSystems" : [ + "LINUX" + ], + "free" : true, + "requiresPatch" : false +} From cd2985b84399b675ca310e6b6cad04f257bfcf90 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sat, 12 Jan 2019 12:38:48 +0100 Subject: [PATCH 03/12] Update script.js --- Engines/Wine/Verbs/FAudio/script.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index 5068b3e12f..42f8240162 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -1,5 +1,4 @@ include(["engines", "wine", "engine", "object"]); -include(["engines", "wine", "plugins", "override_dll"]); include(["utils", "functions", "net", "resource"]); include(["utils", "functions", "filesystem", "files"]); From a3b62396e3989922745cba229e7aad9d549934e4 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 13 Jan 2019 14:15:44 +0100 Subject: [PATCH 04/12] Add files via upload --- Engines/Wine/Verbs/FAudio/script.js | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index 42f8240162..67633a4460 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -1,4 +1,5 @@ include(["engines", "wine", "engine", "object"]); +include(["engines", "wine", "plugins", "override_dll"]); include(["utils", "functions", "net", "resource"]); include(["utils", "functions", "filesystem", "files"]); @@ -8,10 +9,12 @@ include(["utils", "functions", "filesystem", "files"]); * @returns {Wine} Wine object */ Wine.prototype.faudio = function () { + var faudioVersion = "19.01"; + var setupFile = new Resource() .wizard(this.wizard()) - .url("https://github.com/Kron4ek/FAudio-Builds/releases/download/19.01/faudio-19.01.tar.xz") - .name("faudio-19.01.tar.xz") + .url("https://github.com/Kron4ek/FAudio-Builds/releases/download/" + faudioVersion + "/faudio-" + faudioVersion + ".tar.xz") + .name("faudio-" + faudioVersion + ".tar.xz") .get(); new Extractor() @@ -20,7 +23,23 @@ Wine.prototype.faudio = function () { .to(this.prefixDirectory() + "/FAudio/") .extract(); - this.runInsidePrefix("/FAudio/faudio-19.01/wine_setup_faudio.sh") + ls(this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion + "/x32").forEach(function (file) { + if (file.endsWith(".dll")) { + cp(file, this.system32directory()); + this.overrideDLL() + .set("native", [file]) // not sure here, if file is an absolute path, we may need to introduce a basename() function + .do(); + } + }); + + if (this.architecture() == "amd64") + { + ls(this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion + "/x64").forEach(function (file) { + if (file.endsWith(".dll")) { + cp(file, this.system64directory()); + } + }); + } return this; } From 6a28e76c918b3f9f11fedc978bcbac1ba942a781 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 20 Jan 2019 13:20:08 +0100 Subject: [PATCH 05/12] Update script.js --- Engines/Wine/Verbs/FAudio/script.js | 38 ++++++++++------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index 67633a4460..e7af1e0dad 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -22,10 +22,15 @@ Wine.prototype.faudio = function () { .archive(setupFile) .to(this.prefixDirectory() + "/FAudio/") .extract(); - - ls(this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion + "/x32").forEach(function (file) { - if (file.endsWith(".dll")) { - cp(file, this.system32directory()); + + var forEach = Array.prototype.forEach; + var sys32dir = this.system32directory(); + var sys64dir = this.system64directory(); + var faudioDir = this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion; + + forEach.call(ls(faudioDir + "/x32"), function (file) { + if (file.endsWith(".dll")) { + cp(faudioDir + "/x32/" + file, sys32dir); this.overrideDLL() .set("native", [file]) // not sure here, if file is an absolute path, we may need to introduce a basename() function .do(); @@ -34,29 +39,12 @@ Wine.prototype.faudio = function () { if (this.architecture() == "amd64") { - ls(this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion + "/x64").forEach(function (file) { - if (file.endsWith(".dll")) { - cp(file, this.system64directory()); - } + forEach.call(ls(faudioDir + "/x64"), function (file) { + if (file.endsWith(".dll")) { + cp(faudioDir + "/x64/" + file, sys64dir); + } }); } return this; } - -/** - * Verb to install FAudio -*/ -var verbImplementation = { - install: function (container) { - var wine = new Wine(); - wine.prefix(container); - var wizard = SetupWizard(InstallationType.VERBS, "FAudio", java.util.Optional.empty()); - wine.wizard(wizard); - wine.faudio(); - wizard.close(); - } -}; - -/* exported Verb */ -var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); From 10a8bb5f6930ede76c66867b42d34c3904e1ae08 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 20 Jan 2019 13:20:43 +0100 Subject: [PATCH 06/12] Fix oopsie --- Engines/Wine/Verbs/FAudio/script.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index e7af1e0dad..12d471384d 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -48,3 +48,20 @@ Wine.prototype.faudio = function () { return this; } + +/** + * Verb to install FAudio +*/ +var verbImplementation = { + install: function (container) { + var wine = new Wine(); + wine.prefix(container); + var wizard = SetupWizard(InstallationType.VERBS, "FAudio", java.util.Optional.empty()); + wine.wizard(wizard); + wine.faudio(); + wizard.close(); + } +}; + +/* exported Verb */ +var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); From debf4a107649ff527d570cb023692a14c6983f9b Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 20 Jan 2019 13:30:40 +0100 Subject: [PATCH 07/12] Update script.js --- Engines/Wine/Verbs/FAudio/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index 12d471384d..398edd6e7b 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -27,11 +27,12 @@ Wine.prototype.faudio = function () { var sys32dir = this.system32directory(); var sys64dir = this.system64directory(); var faudioDir = this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion; + var self = this; forEach.call(ls(faudioDir + "/x32"), function (file) { if (file.endsWith(".dll")) { cp(faudioDir + "/x32/" + file, sys32dir); - this.overrideDLL() + self.overrideDLL() .set("native", [file]) // not sure here, if file is an absolute path, we may need to introduce a basename() function .do(); } From b50fcc89a68faeeb79b78a5223cb0a67c98b80e6 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 20 Jan 2019 13:36:01 +0100 Subject: [PATCH 08/12] Update script.js --- Engines/Wine/Verbs/FAudio/script.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index 398edd6e7b..4bde2408e6 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -28,22 +28,22 @@ Wine.prototype.faudio = function () { var sys64dir = this.system64directory(); var faudioDir = this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion; var self = this; - + forEach.call(ls(faudioDir + "/x32"), function (file) { if (file.endsWith(".dll")) { - cp(faudioDir + "/x32/" + file, sys32dir); - self.overrideDLL() - .set("native", [file]) // not sure here, if file is an absolute path, we may need to introduce a basename() function - .do(); - } + cp(faudioDir + "/x32/" + file, sys32dir); + self.overrideDLL() + .set("native", [file]) // not sure here, if file is an absolute path, we may need to introduce a basename() function + .do(); + } }); if (this.architecture() == "amd64") { - forEach.call(ls(faudioDir + "/x64"), function (file) { - if (file.endsWith(".dll")) { - cp(faudioDir + "/x64/" + file, sys64dir); - } + forEach.call(ls(faudioDir + "/x64"), function (file) { + if (file.endsWith(".dll")) { + cp(faudioDir + "/x64/" + file, sys64dir); + } }); } From d6698859ac6cbb20ae12cb3be02bb2866959a9bb Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 20 Jan 2019 13:38:55 +0100 Subject: [PATCH 09/12] Update script.js --- Engines/Wine/Verbs/FAudio/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index 4bde2408e6..73ea402806 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -22,7 +22,7 @@ Wine.prototype.faudio = function () { .archive(setupFile) .to(this.prefixDirectory() + "/FAudio/") .extract(); - + var forEach = Array.prototype.forEach; var sys32dir = this.system32directory(); var sys64dir = this.system64directory(); From 6980d46f2f313f18364a7b2b6854455e46295db1 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 20 Jan 2019 13:50:09 +0100 Subject: [PATCH 10/12] Update script.js --- Engines/Wine/Verbs/FAudio/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index 73ea402806..fd0c5fbc09 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -33,7 +33,7 @@ Wine.prototype.faudio = function () { if (file.endsWith(".dll")) { cp(faudioDir + "/x32/" + file, sys32dir); self.overrideDLL() - .set("native", [file]) // not sure here, if file is an absolute path, we may need to introduce a basename() function + .set("native", [file]) .do(); } }); From e8dbc954969d1c342d50e835375691186a4c8610 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 23 Jan 2019 12:00:17 +0100 Subject: [PATCH 11/12] Update script.js --- Engines/Wine/Verbs/FAudio/script.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index fd0c5fbc09..a79cfe0a8b 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -6,10 +6,12 @@ include(["utils", "functions", "filesystem", "files"]); /** * Verb to install FAudio * see: https://github.com/Kron4ek/FAudio-Builds +* @param {String} faudioVersion version of FAudio to downlaod * @returns {Wine} Wine object */ -Wine.prototype.faudio = function () { - var faudioVersion = "19.01"; +Wine.prototype.faudio = function (faudioVersion) { + if(typeof faudioVersion !== 'string') + var faudioVersion = "19.01"; var setupFile = new Resource() .wizard(this.wizard()) From 8c289874c6ada89bc3db2d00603c8d09af66806a Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 23 Jan 2019 18:34:32 +0100 Subject: [PATCH 12/12] Update script.js --- Engines/Wine/Verbs/FAudio/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index a79cfe0a8b..9cca797a64 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -11,7 +11,7 @@ include(["utils", "functions", "filesystem", "files"]); */ Wine.prototype.faudio = function (faudioVersion) { if(typeof faudioVersion !== 'string') - var faudioVersion = "19.01"; + faudioVersion = "19.01"; var setupFile = new Resource() .wizard(this.wizard())