mirror of
https://github.com/lutris/lutris
synced 2024-11-02 08:20:51 +00:00
Provide WINEBIN as a variable in scripts
This commit is contained in:
parent
cb4e5cb315
commit
f6838a8a4c
2 changed files with 9 additions and 9 deletions
|
@ -362,6 +362,11 @@ class CommandsMixin:
|
|||
runner_name = self.installer.runner
|
||||
return runner_name, task_name
|
||||
|
||||
def get_wine_path(self):
|
||||
"""Return absolute path of wine version used during the install"""
|
||||
wine_version = self._get_runner_version()
|
||||
return get_wine_version_exe(wine_version)
|
||||
|
||||
def task(self, data):
|
||||
"""Directive triggering another function specific to a runner.
|
||||
|
||||
|
@ -373,12 +378,10 @@ class CommandsMixin:
|
|||
GLib.idle_add(self.parent.cancel_button.set_sensitive, False)
|
||||
runner_name, task_name = self._get_task_runner_and_name(data.pop("name"))
|
||||
|
||||
wine_version = None
|
||||
|
||||
if runner_name.startswith("wine"):
|
||||
wine_version = self._get_runner_version()
|
||||
if wine_version:
|
||||
data["wine_path"] = get_wine_version_exe(wine_version)
|
||||
wine_path = self.get_wine_path()
|
||||
if wine_path:
|
||||
data["wine_path"] = wine_path
|
||||
data["prefix"] = data.get("prefix") \
|
||||
or self.installer.script.get("game", {}).get("prefix") \
|
||||
or "$GAMEDIR"
|
||||
|
|
|
@ -88,10 +88,6 @@ class ScriptInterpreter(GObject.Object, CommandsMixin):
|
|||
self.installer.script.get('system', {}).get('env', {}).items()
|
||||
}
|
||||
|
||||
# --------------------------
|
||||
# "Initial validation" stage
|
||||
# --------------------------
|
||||
|
||||
@staticmethod
|
||||
def _get_installed_dependency(dependency):
|
||||
"""Return whether a dependency is installed"""
|
||||
|
@ -390,6 +386,7 @@ class ScriptInterpreter(GObject.Object, CommandsMixin):
|
|||
"RESOLUTION": "x".join(self.current_resolution),
|
||||
"RESOLUTION_WIDTH": self.current_resolution[0],
|
||||
"RESOLUTION_HEIGHT": self.current_resolution[1],
|
||||
"WINEBIN": self.get_wine_path(),
|
||||
}
|
||||
replacements.update(self.installer.variables)
|
||||
# Add 'INPUT_<id>' replacements for user inputs with an id
|
||||
|
|
Loading…
Reference in a new issue