trying to fix executable

PhoenicisOrg · Mar 7, 2019 · 32407ae · 32407ae
1 parent db46d16
commit 32407ae
Showing 1 changed file with 8 additions and 20 deletions.
diff --git a/Applications/Games/League of Legends/Online/script.js b/Applications/Games/League of Legends/Online/script.js
@@ -2,15 +2,11 @@ include("engines.wine.quick_script.custom_installer_script");
 include("engines.wine.plugins.windows_version");
 include("engines.wine.shortcuts.wine");
 include("engines.wine.verbs.sandbox");
-include("engines.wine.verbs.d3dx9");
-include("engines.wine.verbs.adobeair");
-include("engines.wine.verbs.corefonts");
-include("engines.wine.verbs.vcrun2008");
-include("engines.wine.verbs.vcrun2017");
-
 
 var installerImplementation = {
     run: function () {
+        var regionID, url; // Removed sha1 which is not used
+        // Moved so it's seen by the .executable
         new CustomInstallerScript()
             .name("League of Legends")
             .editor("Riot Games")
@@ -30,7 +26,6 @@ var installerImplementation = {
                                "Russia"];
                 var selectedRegion = wizard.menu(tr("Select your region:"), regions);
                 // var regionID, url, sha1;
-                var regionID, url; // Removed sha1 which is not used
                 var baseUrl = "https://riotgamespatcher-a.akamaihd.net/releases/live/installer/deploy/League%20of%20Legends%20installer%20";
                 switch (selectedRegion.text){
                     case "EU West":
@@ -79,17 +74,18 @@ var installerImplementation = {
                         // sha1 = "73208f6e3c9e46faf2294958bf3dde0f3df95b36";
                         break;
                 }
-                //var setupFile = new Resource()
-                    //.wizard(wizard)
-                    //.url(url)
+                var setupFile = new Resource()
+                    .wizard(wizard)
+                    .url(url)
                     //.checksum(sha1)
-                    //.name(fileName(url))
-                    //.get();
+                    .name(fileName(url))
+                    .get();
 
                 // OLD: return {command: setupFile, args: ["--installdir", "C:\\LoL\\", "--mode", "unattended"]};
                 //return {command: setupFile, args: ["--installdir", "C:/Riot Games/League of legends/", "--mode", "unattended"]};
             })
             .category("Games")
+            .executable("League\ of\ Legends\ installer\ " + regionID + ".exe")
             .wineDistribution("staging")
             .wineVersion("4.1")
             	// TODO: Gallium9 patchset, improves performance
@@ -99,15 +95,7 @@ var installerImplementation = {
                 wine.windowsVersion("winxp");
                 	// Required to disable DirectX10+ since DXVK causes anti-cheat to trigger (https://github.com/doitsujin/dxvk/issues/835)
                 	// TODO: Disable DirectX10+11 using DLL overrides.
-
-                //mkdir(wine.prefixDirectory() + "drive_c/Riot Games/League of legends/");
-
-                /// Create run script to start the right exe
-                //var client = wine.prefixDirectory() + "drive_c/Riot Games/League of Legends/";
-                //var batContent = "start C:/Riot Games/League of legends/";
-                // OLD: writeToFile(client, batContent);
             })
-            .executable("LeagueClient.exe")
             .go();
     }
 };