Merge master

.eslintrc.yml

@@ -30,6 +30,7 @@ globals:
   # java
   Bean: false
   # files
+  ls: false
   mkdir: false
   fileExists: false
   cat: false

Engines/Wine/Engine/Implementation/script.js

@@ -93,34 +93,51 @@ var engineImplementation = {
             .archive(tmpFile)
             .to(localDirectory)
             .extract();
-    },
-    _installGecko: function (setupWizard, winePackage, localDirectory) {
-        var gecko = new Resource()
-            .wizard(setupWizard)
-            .url(winePackage.geckoUrl)
-            .checksum(winePackage.geckoMd5)
-            .algorithm("md5")
-            .name(winePackage.geckoFile)
-            .directory("gecko")
-            .get();
 
-        var wineGeckoDir = localDirectory + "/share/wine/gecko";
+        var files = ls(localDirectory);
+        if (files.length == 1) {
+            // probably the archive contained a folder (e.g. for Lutris Wine version)
+            // link folders so Phoenicis can find them
+            var extractedDir = files[0];
 
-        lns(new java.io.File(gecko).getParent(), wineGeckoDir);
+            var forEach = Array.prototype.forEach;
+            forEach.call(ls(localDirectory + "/" + extractedDir), function (folder) {
+                lns(localDirectory + "/" + extractedDir + "/" + folder, localDirectory + "/" + folder);
+            }
+            );
+        }
+    },
+    _installGecko: function (setupWizard, winePackage, localDirectory) {
+        if (winePackage.geckoUrl) {
+            var gecko = new Resource()
+                .wizard(setupWizard)
+                .url(winePackage.geckoUrl)
+                .checksum(winePackage.geckoMd5)
+                .algorithm("md5")
+                .name(winePackage.geckoFile)
+                .directory("gecko")
+                .get();
+
+            var wineGeckoDir = localDirectory + "/share/wine/gecko";
+
+            lns(new java.io.File(gecko).getParent(), wineGeckoDir);
+        }
     },
     _installMono: function (setupWizard, winePackage, localDirectory) {
-        var mono = new Resource()
-            .wizard(setupWizard)
-            .url(winePackage.monoUrl)
-            .checksum(winePackage.monoMd5)
-            .algorithm("md5")
-            .name(winePackage.monoFile)
-            .directory("mono")
-            .get();
-
-        var wineMonoDir = localDirectory + "/share/wine/mono";
-
-        lns(new java.io.File(mono).getParent(), wineMonoDir);
+        if (winePackage.monoUrl) {
+            var mono = new Resource()
+                .wizard(setupWizard)
+                .url(winePackage.monoUrl)
+                .checksum(winePackage.monoMd5)
+                .algorithm("md5")
+                .name(winePackage.monoFile)
+                .directory("mono")
+                .get();
+
+            var wineMonoDir = localDirectory + "/share/wine/mono";
+
+            lns(new java.io.File(mono).getParent(), wineMonoDir);
+        }
     },
     delete: function (subCategory, version) {
         if (this.isInstalled(subCategory, version)) {

Engines/Wine/Engine/Object/script.js

@@ -5,9 +5,9 @@ include(["utils", "functions", "net", "download"]);
 include(["utils", "functions", "net", "resource"]);
 
 /* exported LATEST_STABLE_VERSION */
-var LATEST_STABLE_VERSION = "3.0";
+var LATEST_STABLE_VERSION = "3.0.1";
 /* exported LATEST_DEVELOPMENT_VERSION */
-var LATEST_DEVELOPMENT_VERSION = "3.7";
+var LATEST_DEVELOPMENT_VERSION = "3.8";
 /* exported LATEST_STAGING_VERSION */
 var LATEST_STAGING_VERSION = "2.21";
 
@@ -264,4 +264,4 @@ Wine.prototype.system64directory = function () {
 */
 Wine.prototype.fontDirectory = function () {
     return this.prefixDirectory() + "/drive_c/windows/Fonts";
-};
+};

Engines/Wine/QuickScript/Steam Script/script.js

@@ -94,12 +94,13 @@ SteamScript.prototype.go = function () {
         .to(tempFile)
         .get();
 
+    setupWizard.wait(tr("Please follow the steps of the Steam setup.\n\nUncheck \"Run Steam\" or close Steam completely after the setup so that the installation of \"{0}\" can continue.", this._name));
+
     var wine = new Wine()
         .wizard(setupWizard)
         .prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion)
         .luna()
-        .run(tempFile)
-        .wait(tr("Please follow the steps of the Steam setup.\n\nUncheck \"Run Steam\" or close Steam completely after the setup so that the installation of \"{0}\" can continue.", this._name));
+        .run(tempFile, [], null, false, true);
 
     // Steam installation has finished
     setupWizard.wait(tr("Please wait ..."));

Engines/Wine/Verbs/DXVK/script.js

@@ -11,7 +11,7 @@ Wine.prototype.DXVK = function () {
     print("NOTE: you need a driver that supports Vulkan enough to run DXVK");
     print("NOTE: wine version should be greater or equal to 3.5");
 
-    var dxvkVersion = "0.50";
+    var dxvkVersion = "0.51";
 
     var setupFile = new Resource()
         .wizard(this.wizard())

Utils/Functions/Filesystem/Files/script.js

@@ -1,13 +1,22 @@
 var fileAnalyser = Bean("fileAnalyser");
 var fileUtilities = Bean("fileUtilities");
 
+/**
+* lists files and directories
+* @param {string} directoryPath directory path
+* @returns {string[]} list of files and directories
+*/
+function ls(directoryPath) { // eslint-disable-line no-unused-vars
+    return fileUtilities.ls(new java.io.File(directoryPath));
+}
+
 /**
 * creates directory
 * @param {string} directoryPath directory path
 * @returns {void}
 */
 function mkdir(directoryPath) { // eslint-disable-line no-unused-vars
-    fileUtilities.mkdir(new java.io.File(directoryPath))
+    fileUtilities.mkdir(new java.io.File(directoryPath));
 }
 
 /**

docs/jsdoc/AppResource.html

@@ -471,7 +471,7 @@ <h5>Returns:</h5>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AppResource.html">AppResource</a></li><li><a href="CabExtract.html">CabExtract</a></li><li><a href="Checksum.html">Checksum</a></li><li><a href="Downloader.html">Downloader</a></li><li><a href="Extractor.html">Extractor</a></li><li><a href="Resource.html">Resource</a></li><li><a href="ShortcutReader.html">ShortcutReader</a></li><li><a href="Wine.html">Wine</a></li><li><a href="WineShortcut.html">WineShortcut</a></li></ul><h3>Global</h3><ul><li><a href="global.html#cat">cat</a></li><li><a href="global.html#cp">cp</a></li><li><a href="global.html#createTempFile">createTempFile</a></li><li><a href="global.html#engineImplementation">engineImplementation</a></li><li><a href="global.html#fileExists">fileExists</a></li><li><a href="global.html#fileName">fileName</a></li><li><a href="global.html#getFileSize">getFileSize</a></li><li><a href="global.html#lns">lns</a></li><li><a href="global.html#mkdir">mkdir</a></li><li><a href="global.html#remove">remove</a></li><li><a href="global.html#settingImplementation">settingImplementation</a></li><li><a href="global.html#toolImplementation">toolImplementation</a></li><li><a href="global.html#touch">touch</a></li><li><a href="global.html#writeToFile">writeToFile</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AppResource.html">AppResource</a></li><li><a href="CabExtract.html">CabExtract</a></li><li><a href="Checksum.html">Checksum</a></li><li><a href="Downloader.html">Downloader</a></li><li><a href="Extractor.html">Extractor</a></li><li><a href="Resource.html">Resource</a></li><li><a href="ShortcutReader.html">ShortcutReader</a></li><li><a href="Wine.html">Wine</a></li><li><a href="WineShortcut.html">WineShortcut</a></li></ul><h3>Global</h3><ul><li><a href="global.html#cat">cat</a></li><li><a href="global.html#cp">cp</a></li><li><a href="global.html#createTempFile">createTempFile</a></li><li><a href="global.html#engineImplementation">engineImplementation</a></li><li><a href="global.html#fileExists">fileExists</a></li><li><a href="global.html#fileName">fileName</a></li><li><a href="global.html#getFileSize">getFileSize</a></li><li><a href="global.html#lns">lns</a></li><li><a href="global.html#ls">ls</a></li><li><a href="global.html#mkdir">mkdir</a></li><li><a href="global.html#remove">remove</a></li><li><a href="global.html#settingImplementation">settingImplementation</a></li><li><a href="global.html#toolImplementation">toolImplementation</a></li><li><a href="global.html#touch">touch</a></li><li><a href="global.html#writeToFile">writeToFile</a></li></ul>
 </nav>
 
 <br class="clear">

docs/jsdoc/CabExtract.html

@@ -938,7 +938,7 @@ <h5>Returns:</h5>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AppResource.html">AppResource</a></li><li><a href="CabExtract.html">CabExtract</a></li><li><a href="Checksum.html">Checksum</a></li><li><a href="Downloader.html">Downloader</a></li><li><a href="Extractor.html">Extractor</a></li><li><a href="Resource.html">Resource</a></li><li><a href="ShortcutReader.html">ShortcutReader</a></li><li><a href="Wine.html">Wine</a></li><li><a href="WineShortcut.html">WineShortcut</a></li></ul><h3>Global</h3><ul><li><a href="global.html#cat">cat</a></li><li><a href="global.html#cp">cp</a></li><li><a href="global.html#createTempFile">createTempFile</a></li><li><a href="global.html#engineImplementation">engineImplementation</a></li><li><a href="global.html#fileExists">fileExists</a></li><li><a href="global.html#fileName">fileName</a></li><li><a href="global.html#getFileSize">getFileSize</a></li><li><a href="global.html#lns">lns</a></li><li><a href="global.html#mkdir">mkdir</a></li><li><a href="global.html#remove">remove</a></li><li><a href="global.html#settingImplementation">settingImplementation</a></li><li><a href="global.html#toolImplementation">toolImplementation</a></li><li><a href="global.html#touch">touch</a></li><li><a href="global.html#writeToFile">writeToFile</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AppResource.html">AppResource</a></li><li><a href="CabExtract.html">CabExtract</a></li><li><a href="Checksum.html">Checksum</a></li><li><a href="Downloader.html">Downloader</a></li><li><a href="Extractor.html">Extractor</a></li><li><a href="Resource.html">Resource</a></li><li><a href="ShortcutReader.html">ShortcutReader</a></li><li><a href="Wine.html">Wine</a></li><li><a href="WineShortcut.html">WineShortcut</a></li></ul><h3>Global</h3><ul><li><a href="global.html#cat">cat</a></li><li><a href="global.html#cp">cp</a></li><li><a href="global.html#createTempFile">createTempFile</a></li><li><a href="global.html#engineImplementation">engineImplementation</a></li><li><a href="global.html#fileExists">fileExists</a></li><li><a href="global.html#fileName">fileName</a></li><li><a href="global.html#getFileSize">getFileSize</a></li><li><a href="global.html#lns">lns</a></li><li><a href="global.html#ls">ls</a></li><li><a href="global.html#mkdir">mkdir</a></li><li><a href="global.html#remove">remove</a></li><li><a href="global.html#settingImplementation">settingImplementation</a></li><li><a href="global.html#toolImplementation">toolImplementation</a></li><li><a href="global.html#touch">touch</a></li><li><a href="global.html#writeToFile">writeToFile</a></li></ul>
 </nav>
 
 <br class="clear">

docs/jsdoc/Checksum.html

@@ -93,7 +93,7 @@ <h4 class="name" id="Checksum"><span class="type-signature"></span>new Checksum<
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="Utils_Functions_Filesystem_Files_script.js.html">Utils/Functions/Filesystem/Files/script.js</a>, <a href="Utils_Functions_Filesystem_Files_script.js.html#line113">line 113</a>
+        <a href="Utils_Functions_Filesystem_Files_script.js.html">Utils/Functions/Filesystem/Files/script.js</a>, <a href="Utils_Functions_Filesystem_Files_script.js.html#line122">line 122</a>
     </li></ul></dd>
 
 
@@ -199,7 +199,7 @@ <h4 class="name" id="get"><span class="type-signature"></span>get<span class="si
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="Utils_Functions_Filesystem_Files_script.js.html">Utils/Functions/Filesystem/Files/script.js</a>, <a href="Utils_Functions_Filesystem_Files_script.js.html#line152">line 152</a>
+        <a href="Utils_Functions_Filesystem_Files_script.js.html">Utils/Functions/Filesystem/Files/script.js</a>, <a href="Utils_Functions_Filesystem_Files_script.js.html#line161">line 161</a>
     </li></ul></dd>
 
 
@@ -356,7 +356,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="Utils_Functions_Filesystem_Files_script.js.html">Utils/Functions/Filesystem/Files/script.js</a>, <a href="Utils_Functions_Filesystem_Files_script.js.html#line133">line 133</a>
+        <a href="Utils_Functions_Filesystem_Files_script.js.html">Utils/Functions/Filesystem/Files/script.js</a>, <a href="Utils_Functions_Filesystem_Files_script.js.html#line142">line 142</a>
     </li></ul></dd>
 
 
@@ -513,7 +513,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="Utils_Functions_Filesystem_Files_script.js.html">Utils/Functions/Filesystem/Files/script.js</a>, <a href="Utils_Functions_Filesystem_Files_script.js.html#line143">line 143</a>
+        <a href="Utils_Functions_Filesystem_Files_script.js.html">Utils/Functions/Filesystem/Files/script.js</a>, <a href="Utils_Functions_Filesystem_Files_script.js.html#line152">line 152</a>
     </li></ul></dd>
 
 
@@ -670,7 +670,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="Utils_Functions_Filesystem_Files_script.js.html">Utils/Functions/Filesystem/Files/script.js</a>, <a href="Utils_Functions_Filesystem_Files_script.js.html#line123">line 123</a>
+        <a href="Utils_Functions_Filesystem_Files_script.js.html">Utils/Functions/Filesystem/Files/script.js</a>, <a href="Utils_Functions_Filesystem_Files_script.js.html#line132">line 132</a>
     </li></ul></dd>
 
 
@@ -736,7 +736,7 @@ <h5>Returns:</h5>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AppResource.html">AppResource</a></li><li><a href="CabExtract.html">CabExtract</a></li><li><a href="Checksum.html">Checksum</a></li><li><a href="Downloader.html">Downloader</a></li><li><a href="Extractor.html">Extractor</a></li><li><a href="Resource.html">Resource</a></li><li><a href="ShortcutReader.html">ShortcutReader</a></li><li><a href="Wine.html">Wine</a></li><li><a href="WineShortcut.html">WineShortcut</a></li></ul><h3>Global</h3><ul><li><a href="global.html#cat">cat</a></li><li><a href="global.html#cp">cp</a></li><li><a href="global.html#createTempFile">createTempFile</a></li><li><a href="global.html#engineImplementation">engineImplementation</a></li><li><a href="global.html#fileExists">fileExists</a></li><li><a href="global.html#fileName">fileName</a></li><li><a href="global.html#getFileSize">getFileSize</a></li><li><a href="global.html#lns">lns</a></li><li><a href="global.html#mkdir">mkdir</a></li><li><a href="global.html#remove">remove</a></li><li><a href="global.html#settingImplementation">settingImplementation</a></li><li><a href="global.html#toolImplementation">toolImplementation</a></li><li><a href="global.html#touch">touch</a></li><li><a href="global.html#writeToFile">writeToFile</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AppResource.html">AppResource</a></li><li><a href="CabExtract.html">CabExtract</a></li><li><a href="Checksum.html">Checksum</a></li><li><a href="Downloader.html">Downloader</a></li><li><a href="Extractor.html">Extractor</a></li><li><a href="Resource.html">Resource</a></li><li><a href="ShortcutReader.html">ShortcutReader</a></li><li><a href="Wine.html">Wine</a></li><li><a href="WineShortcut.html">WineShortcut</a></li></ul><h3>Global</h3><ul><li><a href="global.html#cat">cat</a></li><li><a href="global.html#cp">cp</a></li><li><a href="global.html#createTempFile">createTempFile</a></li><li><a href="global.html#engineImplementation">engineImplementation</a></li><li><a href="global.html#fileExists">fileExists</a></li><li><a href="global.html#fileName">fileName</a></li><li><a href="global.html#getFileSize">getFileSize</a></li><li><a href="global.html#lns">lns</a></li><li><a href="global.html#ls">ls</a></li><li><a href="global.html#mkdir">mkdir</a></li><li><a href="global.html#remove">remove</a></li><li><a href="global.html#settingImplementation">settingImplementation</a></li><li><a href="global.html#toolImplementation">toolImplementation</a></li><li><a href="global.html#touch">touch</a></li><li><a href="global.html#writeToFile">writeToFile</a></li></ul>
 </nav>
 
 <br class="clear">

docs/jsdoc/Downloader.html

@@ -1521,7 +1521,7 @@ <h5>Returns:</h5>
 </div>
 
 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AppResource.html">AppResource</a></li><li><a href="CabExtract.html">CabExtract</a></li><li><a href="Checksum.html">Checksum</a></li><li><a href="Downloader.html">Downloader</a></li><li><a href="Extractor.html">Extractor</a></li><li><a href="Resource.html">Resource</a></li><li><a href="ShortcutReader.html">ShortcutReader</a></li><li><a href="Wine.html">Wine</a></li><li><a href="WineShortcut.html">WineShortcut</a></li></ul><h3>Global</h3><ul><li><a href="global.html#cat">cat</a></li><li><a href="global.html#cp">cp</a></li><li><a href="global.html#createTempFile">createTempFile</a></li><li><a href="global.html#engineImplementation">engineImplementation</a></li><li><a href="global.html#fileExists">fileExists</a></li><li><a href="global.html#fileName">fileName</a></li><li><a href="global.html#getFileSize">getFileSize</a></li><li><a href="global.html#lns">lns</a></li><li><a href="global.html#mkdir">mkdir</a></li><li><a href="global.html#remove">remove</a></li><li><a href="global.html#settingImplementation">settingImplementation</a></li><li><a href="global.html#toolImplementation">toolImplementation</a></li><li><a href="global.html#touch">touch</a></li><li><a href="global.html#writeToFile">writeToFile</a></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AppResource.html">AppResource</a></li><li><a href="CabExtract.html">CabExtract</a></li><li><a href="Checksum.html">Checksum</a></li><li><a href="Downloader.html">Downloader</a></li><li><a href="Extractor.html">Extractor</a></li><li><a href="Resource.html">Resource</a></li><li><a href="ShortcutReader.html">ShortcutReader</a></li><li><a href="Wine.html">Wine</a></li><li><a href="WineShortcut.html">WineShortcut</a></li></ul><h3>Global</h3><ul><li><a href="global.html#cat">cat</a></li><li><a href="global.html#cp">cp</a></li><li><a href="global.html#createTempFile">createTempFile</a></li><li><a href="global.html#engineImplementation">engineImplementation</a></li><li><a href="global.html#fileExists">fileExists</a></li><li><a href="global.html#fileName">fileName</a></li><li><a href="global.html#getFileSize">getFileSize</a></li><li><a href="global.html#lns">lns</a></li><li><a href="global.html#ls">ls</a></li><li><a href="global.html#mkdir">mkdir</a></li><li><a href="global.html#remove">remove</a></li><li><a href="global.html#settingImplementation">settingImplementation</a></li><li><a href="global.html#toolImplementation">toolImplementation</a></li><li><a href="global.html#touch">touch</a></li><li><a href="global.html#writeToFile">writeToFile</a></li></ul>
 </nav>
 
 <br class="clear">