set wineprefix path from js (#350)

fixes PhoenicisOrg/phoenicis#984
PhoenicisOrg · Aug 19, 2017 · 12eaf4d · 12eaf4d
1 parent a4431b2
commit 12eaf4d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js
@@ -5,14 +5,17 @@ include(["Utils", "Functions", "Net", "Resource"]);
 
 LATEST_STABLE_VERSION = "2.0.2";
 
+WINE_PREFIX_DIR = "wineprefix"
+
+
 /**
  * Wine main prototype
  * @constructor
  */
 function Wine() {
     this._wineWebServiceUrl = Bean("propertyReader").getProperty("webservice.wine.url");
     this._wineEnginesDirectory = Bean("propertyReader").getProperty("application.user.engines") + "/wine";
-    this._winePrefixesDirectory = Bean("propertyReader").getProperty("application.user.wineprefix");
+    this._winePrefixesDirectory = Bean("propertyReader").getProperty("application.user.containers") + "/" + WINE_PREFIX_DIR;
     this._configFactory = Bean("compatibleConfigFileFormatFactory");
     this._OperatingSystemFetcher = Bean("operatingSystemFetcher");
     this._wineDebug = "-all";

diff --git a/Engines/Wine/Shortcuts/Reader/script.js b/Engines/Wine/Shortcuts/Reader/script.js
@@ -5,7 +5,7 @@ var _WineShortcutReader = function(shortcut) {
     that._shortcutManager = Bean("shortcutManager");
     that._libraryManager = Bean("libraryManager");
     that._uiQuestionFactory = Bean("uiQuestionFactory");
-    that._winePrefixesDirectory = Bean("propertyReader").getProperty("application.user.wineprefix");
+    that._winePrefixesDirectory = Bean("propertyReader").getProperty("application.user.containers") + "/" + WINE_PREFIX_DIR;
 
     this.shortcut = shortcut;
 

diff --git a/Engines/Wine/Shortcuts/Wine/script.js b/Engines/Wine/Shortcuts/Wine/script.js
@@ -1,9 +1,11 @@
+include(["Engines", "Wine", "Engine", "Object"]);
+
 var WineShortcut = function () {
     var that = this;
     that._shortcutManager = Bean("shortcutManager");
     that._appsManager = Bean("repositoryManager");
     that._fileSearcher = Bean("fileSearcher");
-    that._winePrefixesDirectory = Bean("propertyReader").getProperty("application.user.wineprefix");
+    that._winePrefixesDirectory = Bean("propertyReader").getProperty("application.user.containers") + "/" + WINE_PREFIX_DIR;
 
     that._category = "Other";
     that._description = "";