From 86fd07c3fc124698e868509b2123884b2e8c3bfa Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Mon, 28 Aug 2017 15:32:29 +0200 Subject: [PATCH 01/10] 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 4ea1cc9821031afb02025eb7cc164ef211d81395 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Fri, 15 Sep 2017 22:05:23 +0200 Subject: [PATCH 02/10] Added dotnet45 and dotnet452 --- Engines/Wine/Verbs/dotnet45/script.js | 44 ++++++++++++++++++++++++++ Engines/Wine/Verbs/dotnet452/script.js | 44 ++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 Engines/Wine/Verbs/dotnet45/script.js create mode 100644 Engines/Wine/Verbs/dotnet452/script.js diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js new file mode 100644 index 0000000000..1fba00a51a --- /dev/null +++ b/Engines/Wine/Verbs/dotnet45/script.js @@ -0,0 +1,44 @@ +include(["Engines", "Wine", "Engine", "Object"]); +include(["Utils", "Functions", "Net", "Resource"]); +include(["Engines", "Wine", "Verbs", "luna"]); +include(["Utils", "Functions", "Filesystem", "Files"]); +include(["Engines", "Wine", "Verbs", "dotnet40"]); + +Wine.prototype.dotnet45 = function() { + //Inspired from winetricks mspatcha, and from POL4 POL_install_dotnet45 + if (this.architecture() == "amd64") { + throw "{0} cannot be installed in a 64bit wine prefix!".format("dotnet45"); + } + + var setupFile = new Resource() + .wizard(this._wizard) + .url("http://download.microsoft.com/download/b/a/4/ba4a7e71-2906-4b2d-a0e1-80cf16844f5f/dotnetfx45_full_x86_x64.exe") + .checksum("b2ff712ca0947040ca0b8e9bd7436a3c3524bb5d") + .name("dotnetfx45_full_x86_x64.exe") + .get(); + + this.uninstall("Mono"); + + this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"]) + .wait(tr("Please wait ...")); + + remove(this.system32directory() + "/mscoree.dll"); + + this.dotnet40(); + this.windowsVersion("win7"); + + this.overrideDLL() + .set("builtin", ["fusion"]) + .do(); + + this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""]) + .wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5")); + + this.overrideDLL() + .set("native", ["mscoree"]) + .do(); + + this.windowsVersion("win2003"); + + return this; +}; diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js new file mode 100644 index 0000000000..ca036aaa68 --- /dev/null +++ b/Engines/Wine/Verbs/dotnet452/script.js @@ -0,0 +1,44 @@ +include(["Engines", "Wine", "Engine", "Object"]); +include(["Utils", "Functions", "Net", "Resource"]); +include(["Engines", "Wine", "Verbs", "luna"]); +include(["Utils", "Functions", "Filesystem", "Files"]); +include(["Engines", "Wine", "Verbs", "dotnet40"]); + +Wine.prototype.dotnet452 = function() { + //Inspired from winetricks mspatcha, and from POL4 POL_install_dotnet45 + if (this.architecture() == "amd64") { + throw "{0} cannot be installed in a 64bit wine prefix!".format("dotnet452"); + } + + var setupFile = new Resource() + .wizard(this._wizard) + .url("https://download.microsoft.com/download/E/2/1/E21644B5-2DF2-47C2-91BD-63C560427900/NDP452-KB2901907-x86-x64-AllOS-ENU.exe") + .checksum("89f86f9522dc7a8a965facce839abb790a285a63") + .name("NDP452-KB2901907-x86-x64-AllOS-ENU.exe") + .get(); + + this.uninstall("Mono"); + + this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"]) + .wait(tr("Please wait ...")); + + remove(this.system32directory() + "/mscoree.dll"); + + this.dotnet40(); + this.windowsVersion("win7"); + + this.overrideDLL() + .set("builtin", ["fusion"]) + .do(); + + this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""]) + .wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5.2")); + + this.overrideDLL() + .set("native", ["mscoree"]) + .do(); + + this.windowsVersion("win2003"); + + return this; +}; From 787217224c2ae6bb47f5f5c58d76ddce140971e2 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Fri, 15 Sep 2017 22:30:30 +0200 Subject: [PATCH 03/10] Update script.js --- Engines/Wine/Verbs/dotnet45/script.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js index 1fba00a51a..2eca39693a 100644 --- a/Engines/Wine/Verbs/dotnet45/script.js +++ b/Engines/Wine/Verbs/dotnet45/script.js @@ -4,8 +4,13 @@ include(["Engines", "Wine", "Verbs", "luna"]); include(["Utils", "Functions", "Filesystem", "Files"]); include(["Engines", "Wine", "Verbs", "dotnet40"]); +/** +* Inspired from winetricks dotnet45 and POL4 POL_install_dotnet45 +* -> https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks +* @returns {Wine} +*/ Wine.prototype.dotnet45 = function() { - //Inspired from winetricks mspatcha, and from POL4 POL_install_dotnet45 + if (this.architecture() == "amd64") { throw "{0} cannot be installed in a 64bit wine prefix!".format("dotnet45"); } From a2b52adab60807c95d312f0becc0f69082030019 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Fri, 15 Sep 2017 22:30:52 +0200 Subject: [PATCH 04/10] Update script.js --- Engines/Wine/Verbs/dotnet452/script.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js index ca036aaa68..705069a8a9 100644 --- a/Engines/Wine/Verbs/dotnet452/script.js +++ b/Engines/Wine/Verbs/dotnet452/script.js @@ -4,8 +4,12 @@ include(["Engines", "Wine", "Verbs", "luna"]); include(["Utils", "Functions", "Filesystem", "Files"]); include(["Engines", "Wine", "Verbs", "dotnet40"]); +/** +* Inspired from winetricks dotnet452 and POL4 POL_install_dotnet45 +* -> https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks +* @returns {Wine} +*/ Wine.prototype.dotnet452 = function() { - //Inspired from winetricks mspatcha, and from POL4 POL_install_dotnet45 if (this.architecture() == "amd64") { throw "{0} cannot be installed in a 64bit wine prefix!".format("dotnet452"); } From 12cb2cab28fdd62fffcbd9f3f311c4a42dd62c52 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Fri, 15 Sep 2017 22:38:25 +0200 Subject: [PATCH 05/10] Update script.js --- Engines/Wine/Verbs/dotnet45/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js index 2eca39693a..6ec0685ebf 100644 --- a/Engines/Wine/Verbs/dotnet45/script.js +++ b/Engines/Wine/Verbs/dotnet45/script.js @@ -6,7 +6,7 @@ include(["Engines", "Wine", "Verbs", "dotnet40"]); /** * Inspired from winetricks dotnet45 and POL4 POL_install_dotnet45 -* -> https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks +* -> https://github.com/Winetricks/winetricks/blob/63bc6dbe612d017a0cb6bf6e4cde265162d75bca/src/winetricks#L8523 * @returns {Wine} */ Wine.prototype.dotnet45 = function() { From 0c13791a4b2a68827551f25d74b12446713e33cf Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Fri, 15 Sep 2017 22:38:36 +0200 Subject: [PATCH 06/10] Update script.js --- Engines/Wine/Verbs/dotnet452/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js index 705069a8a9..0dabdcf398 100644 --- a/Engines/Wine/Verbs/dotnet452/script.js +++ b/Engines/Wine/Verbs/dotnet452/script.js @@ -6,7 +6,7 @@ include(["Engines", "Wine", "Verbs", "dotnet40"]); /** * Inspired from winetricks dotnet452 and POL4 POL_install_dotnet45 -* -> https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks +* -> https://github.com/Winetricks/winetricks/blob/63bc6dbe612d017a0cb6bf6e4cde265162d75bca/src/winetricks#L8523 * @returns {Wine} */ Wine.prototype.dotnet452 = function() { From 8f7a35ad58068b7049fc8fb776c2190b5bd4e2de Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Fri, 15 Sep 2017 23:01:47 +0200 Subject: [PATCH 07/10] Update script.js --- Engines/Wine/Verbs/dotnet452/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js index 0dabdcf398..f644322226 100644 --- a/Engines/Wine/Verbs/dotnet452/script.js +++ b/Engines/Wine/Verbs/dotnet452/script.js @@ -5,7 +5,7 @@ include(["Utils", "Functions", "Filesystem", "Files"]); include(["Engines", "Wine", "Verbs", "dotnet40"]); /** -* Inspired from winetricks dotnet452 and POL4 POL_install_dotnet45 +* Inspired from dotnet40 verb, winetricks dotnet452 and POL4 POL_install_dotnet45 * -> https://github.com/Winetricks/winetricks/blob/63bc6dbe612d017a0cb6bf6e4cde265162d75bca/src/winetricks#L8523 * @returns {Wine} */ From cd0217750f8432f66a966d18a261c8846712ab1c Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Fri, 15 Sep 2017 23:02:05 +0200 Subject: [PATCH 08/10] Update script.js --- Engines/Wine/Verbs/dotnet45/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js index 6ec0685ebf..11c5f321ac 100644 --- a/Engines/Wine/Verbs/dotnet45/script.js +++ b/Engines/Wine/Verbs/dotnet45/script.js @@ -5,7 +5,7 @@ include(["Utils", "Functions", "Filesystem", "Files"]); include(["Engines", "Wine", "Verbs", "dotnet40"]); /** -* Inspired from winetricks dotnet45 and POL4 POL_install_dotnet45 +* Inspired from dotnet40 verb, winetricks dotnet45 and POL4 POL_install_dotnet45 * -> https://github.com/Winetricks/winetricks/blob/63bc6dbe612d017a0cb6bf6e4cde265162d75bca/src/winetricks#L8523 * @returns {Wine} */ From 275a4e0f2a0fb57db65e5afffd238115f6dd1d09 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sat, 16 Sep 2017 00:45:40 +0200 Subject: [PATCH 09/10] Update script.js --- Engines/Wine/Verbs/dotnet45/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js index 11c5f321ac..cb9af452ae 100644 --- a/Engines/Wine/Verbs/dotnet45/script.js +++ b/Engines/Wine/Verbs/dotnet45/script.js @@ -6,7 +6,7 @@ include(["Engines", "Wine", "Verbs", "dotnet40"]); /** * Inspired from dotnet40 verb, winetricks dotnet45 and POL4 POL_install_dotnet45 -* -> https://github.com/Winetricks/winetricks/blob/63bc6dbe612d017a0cb6bf6e4cde265162d75bca/src/winetricks#L8523 +* -> https://github.com/Winetricks/winetricks/blob/63bc6dbe612d017a0cb6bf6e4cde265162d75bca/src/winetricks#L6886 * @returns {Wine} */ Wine.prototype.dotnet45 = function() { From e4f3f347d20eda8d89e6cdfc62fa0155eea0ba41 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sat, 16 Sep 2017 00:46:03 +0200 Subject: [PATCH 10/10] Update script.js --- Engines/Wine/Verbs/dotnet452/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js index f644322226..aa7072ea49 100644 --- a/Engines/Wine/Verbs/dotnet452/script.js +++ b/Engines/Wine/Verbs/dotnet452/script.js @@ -6,7 +6,7 @@ include(["Engines", "Wine", "Verbs", "dotnet40"]); /** * Inspired from dotnet40 verb, winetricks dotnet452 and POL4 POL_install_dotnet45 -* -> https://github.com/Winetricks/winetricks/blob/63bc6dbe612d017a0cb6bf6e4cde265162d75bca/src/winetricks#L8523 +* -> https://github.com/Winetricks/winetricks/blob/63bc6dbe612d017a0cb6bf6e4cde265162d75bca/src/winetricks#L6938 * @returns {Wine} */ Wine.prototype.dotnet452 = function() {