mirrors/an-anime-game-launcher
1
0
Fork 0
mirror of https://github.com/an-anime-team/an-anime-game-launcher.git synced 2024-12-29 21:18:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed DXVK.apply() compatibility with Wine-GE 7.*

Browse source 
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
This commit is contained in:
Observer KRypt0n_ 2022-02-04 21:10:25 +02:00
parent 69d621761a
commit b1c960398c
No known key found for this signature in database
GPG key ID: DC5D4EC1303465DA
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ts/core/DXVK.ts
View file

@ -136,7 +136,7 @@ export default class DXVK
*/ */
public static delete(dxvk: TDXVK|TDXVK['version']): Promise<void> public static delete(dxvk: TDXVK|TDXVK['version']): Promise<void>
{ {
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) => { return new Promise(async (resolve) => {
const version = typeof dxvk !== 'string' ? const version = typeof dxvk !== 'string' ?
@ -159,7 +159,7 @@ export default class DXVK
const version = typeof dxvk !== 'string' ? const version = typeof dxvk !== 'string' ?
dxvk.version : dxvk; 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 dxvkDir = `${await constants.paths.dxvksDir}/dxvk-${version}`;
const runner = await Runners.current(); 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 * 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 * Make the installation script executable