From b1c960398c15b51c654bcd00ea0d67c4023fedb7 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Fri, 4 Feb 2022 21:10:25 +0200 Subject: [PATCH] Fixed `DXVK.apply()` compatibility with Wine-GE 7.* In this version was changed `--version` output to the `ge-7.*`, and thus because `setup_dxvk.sh` script is searching for `grep wine` (`wine-*`) output, it has been ending with an error that wine is not provided --- src/ts/core/DXVK.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ts/core/DXVK.ts b/src/ts/core/DXVK.ts index 757dfcc..5886263 100644 --- a/src/ts/core/DXVK.ts +++ b/src/ts/core/DXVK.ts @@ -136,7 +136,7 @@ export default class DXVK */ public static delete(dxvk: TDXVK|TDXVK['version']): Promise { - const debugThread = new DebugThread('DXVK.delete', `Deleting dxvk ${typeof dxvk === 'string' ? dxvk : dxvk.version}`); + const debugThread = new DebugThread('DXVK.delete', `Deleting DXVK ${typeof dxvk === 'string' ? dxvk : dxvk.version}`); return new Promise(async (resolve) => { const version = typeof dxvk !== 'string' ? @@ -159,7 +159,7 @@ export default class DXVK const version = typeof dxvk !== 'string' ? dxvk.version : dxvk; - const debugThread = new DebugThread('DXVK.apply', `Applying dxvk ${version}`); + const debugThread = new DebugThread('DXVK.apply', `Applying DXVK ${version}`); const dxvkDir = `${await constants.paths.dxvksDir}/dxvk-${version}`; const runner = await Runners.current(); @@ -170,7 +170,7 @@ export default class DXVK /** * Replace all wine entries and remove wineboot -u to make applying dxvk work */ - () => Neutralino.os.execCommand(`sed -i 's/wine="wine"/wine="${runnerDir.replaceAll('/', '\\/')}\\/${runner!.files.wine.replace('64', '').replaceAll('/', '\\/')}"/g' ${dxvkDir}/setup_dxvk.sh && sed -i 's/wine64="wine64"/wine64="${runnerDir.replaceAll('/', '\\/')}\\/${runner!.files.wine.replaceAll('/', '\\/')}"/g' ${dxvkDir}/setup_dxvk.sh && sed -i 's/wineboot="wineboot"/wineboot="${runnerDir.replaceAll('/', '\\/')}\\/${runner!.files.wine.replace('64', 'boot').replaceAll('/', '\\/')}"/g' ${dxvkDir}/setup_dxvk.sh && sed -i '/$wineboot -u/d' ${dxvkDir}/setup_dxvk.sh`), + () => Neutralino.os.execCommand(`sed -i 's/wine="wine"/wine="${runnerDir.replaceAll('/', '\\/')}\\/${runner!.files.wine.replace('64', '').replaceAll('/', '\\/')}"/g' "${path.addSlashes(dxvkDir)}/setup_dxvk.sh" && sed -i 's/wine64="wine64"/wine64="${runnerDir.replaceAll('/', '\\/')}\\/${runner!.files.wine.replaceAll('/', '\\/')}"/g' "${path.addSlashes(dxvkDir)}/setup_dxvk.sh" && sed -i 's/wineboot="wineboot"/wineboot="${runnerDir.replaceAll('/', '\\/')}\\/${runner!.files.wine.replace('64', 'boot').replaceAll('/', '\\/')}"/g' "${path.addSlashes(dxvkDir)}/setup_dxvk.sh" && sed -i 's/winever=$($wine --version | grep wine)/winever=$($wine --version | grep "wine\\\\|GE")/g' "${path.addSlashes(dxvkDir)}/setup_dxvk.sh" && sed -i '/$wineboot -u/d' "${path.addSlashes(dxvkDir)}/setup_dxvk.sh"`), /** * Make the installation script executable