From 86fd07c3fc124698e868509b2123884b2e8c3bfa Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Mon, 28 Aug 2017 15:32:29 +0200 Subject: [PATCH 1/7] 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 e64374c1a395ab5d8fd4fd91d83ff2c857c5a3a1 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 19 May 2019 16:59:07 +0200 Subject: [PATCH 2/7] Runtime --- Engines/Wine/Engine/Implementation/script.js | 111 ++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/Engines/Wine/Engine/Implementation/script.js b/Engines/Wine/Engine/Implementation/script.js index 536cbd9b9c..e6b3c549bb 100644 --- a/Engines/Wine/Engine/Implementation/script.js +++ b/Engines/Wine/Engine/Implementation/script.js @@ -32,6 +32,7 @@ var engineImplementation = { return fileExists(this.getLocalDirectory(subCategory, version)); }, install: function (subCategory, version) { + this._installRuntime(this.getWizard()); var parts = subCategory.split("-"); var distribution = parts[0]; var architecture = parts[2]; @@ -98,6 +99,110 @@ var engineImplementation = { ); } }, + _installRuntime: function (setupWizard) { + var runtimeJsonPath = this._wineEnginesDirectory + "/runtime.json"; + var runtimeJson; + var downloadamd64 = false; + var downloadx86 = false; + if(!fileExists(runtimeJsonPath)) { + mkdir(this._wineEnginesDirectory + "/runtime"); + var runtimeJsonFile = new Downloader() + .wizard(this._wizard) + .message(tr("Downloading runtime json")) + .url("https://phoenicis.playonlinux.com/index.php/runtime?os=linux") + .to(runtimeJsonPath) + .get(); + + runtimeJson = JSON.parse(cat(runtimeJsonFile)); + var downloadamd64 = true; + var downloadx86 = true; + } + else { + var oldRuntimeJsonFile = cat(this._wineEnginesDirectory + "/runtime.json"); + var oldRuntimeJson = JSON.parse(oldRuntimeJsonFile); + + var runtimeJsonFile = new Downloader() + .wizard(this._wizard) + .message(tr("Downloading runtime json")) + .url("https://phoenicis.playonlinux.com/index.php/runtime?os=linux") + .to(runtimeJsonPath) + .get(); + + runtimeJson = JSON.parse(cat(runtimeJsonFile)); + var oldCheckSumamd64; + var oldCheckSumx86; + oldRuntimeJson.forEach(function(arch){ + if(arch.arch == "amd64") { + oldCheckSumamd64 = arch.sha1sum; + } + else{ + oldCheckSumx86 = arch.sha1sum; + } + + }); + runtimeJson.forEach(function(arch){ + if(arch.arch == "amd64" && arch.sha1sum != oldCheckSumamd64){ + downloadamd64 = true; + } + else if(arch.arch == "x86" && arch.sha1sum != oldCheckSumx86){ + downloadx86 = true; + } + }); + } + + if(downloadx86 == true) { + remove(this._wineEnginesDirectory + "/runtime/lib"); + mkdir(this._wineEnginesDirectory + "/TMP"); + that = this; + runtimeJson.forEach(function(arch){ + var runtime; + + if(arch.arch == "x86") { + runtime = new Downloader() + .wizard(setupWizard) + .url(arch.url) + .message(tr("Downloading x86 runtime")) + .checksum(arch.sha1sum) + .to(that._wineEnginesDirectory + "/TMP/" + arch.url.substring(arch.url.lastIndexOf('/')+1)) + .get(); + + new Extractor() + .wizard(setupWizard) + .archive(runtime) + .to(that._wineEnginesDirectory + "/runtime") + .extract(); + + } + }); + remove(this._wineEnginesDirectory + "/TMP"); + } + if(downloadamd64 == true) { + remove(this._wineEnginesDirectory + "/runtime/lib64"); + mkdir(this._wineEnginesDirectory + "/TMP"); + that = this; + runtimeJson.forEach(function(arch){ + var runtime; + + if(arch.arch == "amd64") { + runtime = new Downloader() + .wizard(setupWizard) + .url(arch.url) + .message(tr("Downloading amd64 runtime")) + .checksum(arch.sha1sum) + .to(that._wineEnginesDirectory + "/TMP/" + arch.url.substring(arch.url.lastIndexOf('/')+1)) + .get(); + + new Extractor() + .wizard(setupWizard) + .archive(runtime) + .to(that._wineEnginesDirectory + "/runtime") + .extract(); + + } + }); + remove(this._wineEnginesDirectory + "/TMP"); + } + }, _installGecko: function (setupWizard, winePackage, localDirectory) { if (winePackage.geckoUrl) { var gecko = new Resource() @@ -253,9 +358,11 @@ var engineImplementation = { ldPath = userData.ldPath + ldPath; } if (architecture == "amd64") { - ldPath = this.getLocalDirectory(subCategory, version) + "/lib64/:" + ldPath + ldPath = this._wineEnginesDirectory + "runtime/lib64/:" + this._wineEnginesDirectory + "runtime/lib/:" + + this.getLocalDirectory(subCategory, version) + "/lib64/:" + + this.getLocalDirectory(subCategory, version) + "/lib/:"+ ldPath; } else { - ldPath = this.getLocalDirectory(subCategory, version) + "/lib/:" + ldPath + ldPath = this._wineEnginesDirectory + "runtime/lib/:" + this.getLocalDirectory(subCategory, version) + "/lib/:" + ldPath; } environment.put("LD_LIBRARY_PATH", ldPath); From 62bed279a4a6adac785e2ecffbc7ec3cc03938d1 Mon Sep 17 00:00:00 2001 From: test Date: Sun, 19 May 2019 17:12:12 +0200 Subject: [PATCH 3/7] Fix codacy (1st try) --- Engines/Wine/Engine/Implementation/script.js | 72 ++++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/Engines/Wine/Engine/Implementation/script.js b/Engines/Wine/Engine/Implementation/script.js index e6b3c549bb..6b1dcb2f2a 100644 --- a/Engines/Wine/Engine/Implementation/script.js +++ b/Engines/Wine/Engine/Implementation/script.js @@ -104,7 +104,7 @@ var engineImplementation = { var runtimeJson; var downloadamd64 = false; var downloadx86 = false; - if(!fileExists(runtimeJsonPath)) { + if (!fileExists(runtimeJsonPath)) { mkdir(this._wineEnginesDirectory + "/runtime"); var runtimeJsonFile = new Downloader() .wizard(this._wizard) @@ -112,7 +112,7 @@ var engineImplementation = { .url("https://phoenicis.playonlinux.com/index.php/runtime?os=linux") .to(runtimeJsonPath) .get(); - + runtimeJson = JSON.parse(cat(runtimeJsonFile)); var downloadamd64 = true; var downloadx86 = true; @@ -120,44 +120,44 @@ var engineImplementation = { else { var oldRuntimeJsonFile = cat(this._wineEnginesDirectory + "/runtime.json"); var oldRuntimeJson = JSON.parse(oldRuntimeJsonFile); - + var runtimeJsonFile = new Downloader() .wizard(this._wizard) .message(tr("Downloading runtime json")) .url("https://phoenicis.playonlinux.com/index.php/runtime?os=linux") .to(runtimeJsonPath) .get(); - + runtimeJson = JSON.parse(cat(runtimeJsonFile)); var oldCheckSumamd64; var oldCheckSumx86; - oldRuntimeJson.forEach(function(arch){ - if(arch.arch == "amd64") { + oldRuntimeJson.forEach(function (arch){ + if (arch.arch == "amd64") { oldCheckSumamd64 = arch.sha1sum; } - else{ + else { oldCheckSumx86 = arch.sha1sum; } }); - runtimeJson.forEach(function(arch){ - if(arch.arch == "amd64" && arch.sha1sum != oldCheckSumamd64){ + runtimeJson.forEach(function (arch){ + if (arch.arch == "amd64" && arch.sha1sum != oldCheckSumamd64){ downloadamd64 = true; } - else if(arch.arch == "x86" && arch.sha1sum != oldCheckSumx86){ + else if (arch.arch == "x86" && arch.sha1sum != oldCheckSumx86){ downloadx86 = true; } }); } - - if(downloadx86 == true) { + + if (downloadx86 == true) { remove(this._wineEnginesDirectory + "/runtime/lib"); mkdir(this._wineEnginesDirectory + "/TMP"); that = this; - runtimeJson.forEach(function(arch){ + runtimeJson.forEach(function (arch){ var runtime; - - if(arch.arch == "x86") { + + if (arch.arch == "x86") { runtime = new Downloader() .wizard(setupWizard) .url(arch.url) @@ -165,25 +165,25 @@ var engineImplementation = { .checksum(arch.sha1sum) .to(that._wineEnginesDirectory + "/TMP/" + arch.url.substring(arch.url.lastIndexOf('/')+1)) .get(); - - new Extractor() - .wizard(setupWizard) - .archive(runtime) - .to(that._wineEnginesDirectory + "/runtime") - .extract(); - - } + + new Extractor() + .wizard(setupWizard) + .archive(runtime) + .to(that._wineEnginesDirectory + "/runtime") + .extract(); + + } }); remove(this._wineEnginesDirectory + "/TMP"); } - if(downloadamd64 == true) { + if (downloadamd64 == true) { remove(this._wineEnginesDirectory + "/runtime/lib64"); mkdir(this._wineEnginesDirectory + "/TMP"); that = this; - runtimeJson.forEach(function(arch){ + runtimeJson.forEach(function (arch){ var runtime; - - if(arch.arch == "amd64") { + + if (arch.arch == "amd64") { runtime = new Downloader() .wizard(setupWizard) .url(arch.url) @@ -191,14 +191,14 @@ var engineImplementation = { .checksum(arch.sha1sum) .to(that._wineEnginesDirectory + "/TMP/" + arch.url.substring(arch.url.lastIndexOf('/')+1)) .get(); - - new Extractor() - .wizard(setupWizard) - .archive(runtime) - .to(that._wineEnginesDirectory + "/runtime") - .extract(); - - } + + new Extractor() + .wizard(setupWizard) + .archive(runtime) + .to(that._wineEnginesDirectory + "/runtime") + .extract(); + + } }); remove(this._wineEnginesDirectory + "/TMP"); } @@ -359,7 +359,7 @@ var engineImplementation = { } if (architecture == "amd64") { ldPath = this._wineEnginesDirectory + "runtime/lib64/:" + this._wineEnginesDirectory + "runtime/lib/:" - + this.getLocalDirectory(subCategory, version) + "/lib64/:" + + this.getLocalDirectory(subCategory, version) + "/lib64/:" + this.getLocalDirectory(subCategory, version) + "/lib/:"+ ldPath; } else { ldPath = this._wineEnginesDirectory + "runtime/lib/:" + this.getLocalDirectory(subCategory, version) + "/lib/:" + ldPath; From 62b960a503563e83f7fbe4543674657ca0f910ae Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 19 May 2019 17:25:46 +0200 Subject: [PATCH 4/7] Fix codacy (2nd time) --- Engines/Wine/Engine/Implementation/script.js | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Engines/Wine/Engine/Implementation/script.js b/Engines/Wine/Engine/Implementation/script.js index 6b1dcb2f2a..f0b2d45b7d 100644 --- a/Engines/Wine/Engine/Implementation/script.js +++ b/Engines/Wine/Engine/Implementation/script.js @@ -105,7 +105,7 @@ var engineImplementation = { var downloadamd64 = false; var downloadx86 = false; if (!fileExists(runtimeJsonPath)) { - mkdir(this._wineEnginesDirectory + "/runtime"); + mkdir(this._wineEnginesDirectory + "/runtime"); var runtimeJsonFile = new Downloader() .wizard(this._wizard) .message(tr("Downloading runtime json")) @@ -114,14 +114,14 @@ var engineImplementation = { .get(); runtimeJson = JSON.parse(cat(runtimeJsonFile)); - var downloadamd64 = true; - var downloadx86 = true; + downloadamd64 = true; + downloadx86 = true; } else { - var oldRuntimeJsonFile = cat(this._wineEnginesDirectory + "/runtime.json"); - var oldRuntimeJson = JSON.parse(oldRuntimeJsonFile); + var oldRuntimeJsonFile = cat(this._wineEnginesDirectory + "/runtime.json"); + var oldRuntimeJson = JSON.parse(oldRuntimeJsonFile); - var runtimeJsonFile = new Downloader() + var runtimeJsonFile = new Downloader() .wizard(this._wizard) .message(tr("Downloading runtime json")) .url("https://phoenicis.playonlinux.com/index.php/runtime?os=linux") @@ -132,21 +132,21 @@ var engineImplementation = { var oldCheckSumamd64; var oldCheckSumx86; oldRuntimeJson.forEach(function (arch){ - if (arch.arch == "amd64") { - oldCheckSumamd64 = arch.sha1sum; + if (arch.arch == "amd64") { + oldCheckSumamd64 = arch.sha1sum; } - else { + else { oldCheckSumx86 = arch.sha1sum; } }); runtimeJson.forEach(function (arch){ - if (arch.arch == "amd64" && arch.sha1sum != oldCheckSumamd64){ - downloadamd64 = true; - } - else if (arch.arch == "x86" && arch.sha1sum != oldCheckSumx86){ - downloadx86 = true; + if (arch.arch == "amd64" && arch.sha1sum != oldCheckSumamd64){ + downloadamd64 = true; } + else if (arch.arch == "x86" && arch.sha1sum != oldCheckSumx86){ + downloadx86 = true; + } }); } @@ -177,9 +177,9 @@ var engineImplementation = { remove(this._wineEnginesDirectory + "/TMP"); } if (downloadamd64 == true) { - remove(this._wineEnginesDirectory + "/runtime/lib64"); - mkdir(this._wineEnginesDirectory + "/TMP"); - that = this; + remove(this._wineEnginesDirectory + "/runtime/lib64"); + mkdir(this._wineEnginesDirectory + "/TMP"); + var that = this; runtimeJson.forEach(function (arch){ var runtime; From ba50f0dccdd4c721d8e594495a2382276daa0b19 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 19 May 2019 17:32:00 +0200 Subject: [PATCH 5/7] Fix codacy (3rd time) --- Engines/Wine/Engine/Implementation/script.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Engines/Wine/Engine/Implementation/script.js b/Engines/Wine/Engine/Implementation/script.js index f0b2d45b7d..d4482b4d99 100644 --- a/Engines/Wine/Engine/Implementation/script.js +++ b/Engines/Wine/Engine/Implementation/script.js @@ -102,11 +102,12 @@ var engineImplementation = { _installRuntime: function (setupWizard) { var runtimeJsonPath = this._wineEnginesDirectory + "/runtime.json"; var runtimeJson; + var runtimeJsonFile; var downloadamd64 = false; var downloadx86 = false; if (!fileExists(runtimeJsonPath)) { mkdir(this._wineEnginesDirectory + "/runtime"); - var runtimeJsonFile = new Downloader() + runtimeJsonFile = new Downloader() .wizard(this._wizard) .message(tr("Downloading runtime json")) .url("https://phoenicis.playonlinux.com/index.php/runtime?os=linux") @@ -121,7 +122,7 @@ var engineImplementation = { var oldRuntimeJsonFile = cat(this._wineEnginesDirectory + "/runtime.json"); var oldRuntimeJson = JSON.parse(oldRuntimeJsonFile); - var runtimeJsonFile = new Downloader() + runtimeJsonFile = new Downloader() .wizard(this._wizard) .message(tr("Downloading runtime json")) .url("https://phoenicis.playonlinux.com/index.php/runtime?os=linux") @@ -136,14 +137,14 @@ var engineImplementation = { oldCheckSumamd64 = arch.sha1sum; } else { - oldCheckSumx86 = arch.sha1sum; + oldCheckSumx86 = arch.sha1sum; } }); runtimeJson.forEach(function (arch){ if (arch.arch == "amd64" && arch.sha1sum != oldCheckSumamd64){ downloadamd64 = true; - } + } else if (arch.arch == "x86" && arch.sha1sum != oldCheckSumx86){ downloadx86 = true; } @@ -152,7 +153,7 @@ var engineImplementation = { if (downloadx86 == true) { remove(this._wineEnginesDirectory + "/runtime/lib"); - mkdir(this._wineEnginesDirectory + "/TMP"); + mkdir(this._wineEnginesDirectory + "/TMP"); that = this; runtimeJson.forEach(function (arch){ var runtime; From d3d6c357ed891f42336d34ce028e14d4c1eb4497 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 19 May 2019 17:42:36 +0200 Subject: [PATCH 6/7] Update script.js --- Engines/Wine/Engine/Implementation/script.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Engines/Wine/Engine/Implementation/script.js b/Engines/Wine/Engine/Implementation/script.js index d4482b4d99..21ea073dd1 100644 --- a/Engines/Wine/Engine/Implementation/script.js +++ b/Engines/Wine/Engine/Implementation/script.js @@ -138,8 +138,7 @@ var engineImplementation = { } else { oldCheckSumx86 = arch.sha1sum; - } - + } }); runtimeJson.forEach(function (arch){ if (arch.arch == "amd64" && arch.sha1sum != oldCheckSumamd64){ From 569f7e859e44f2c1a8046becc7ff553624694981 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sun, 19 May 2019 17:45:53 +0200 Subject: [PATCH 7/7] Update script.js --- Engines/Wine/Engine/Implementation/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Engine/Implementation/script.js b/Engines/Wine/Engine/Implementation/script.js index 21ea073dd1..acf7a7dd97 100644 --- a/Engines/Wine/Engine/Implementation/script.js +++ b/Engines/Wine/Engine/Implementation/script.js @@ -135,7 +135,7 @@ var engineImplementation = { oldRuntimeJson.forEach(function (arch){ if (arch.arch == "amd64") { oldCheckSumamd64 = arch.sha1sum; - } + } else { oldCheckSumx86 = arch.sha1sum; }