From f257a794ccbf2d3efa77d56e220b75f449ab1675 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 13 Apr 2020 20:12:40 +0200 Subject: [PATCH] [meta] Trim \r character from winepath output. Wine 5.6 for some reason now requires this. Fixes #1569. --- setup_dxvk.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup_dxvk.sh b/setup_dxvk.sh index 0c161447..a9105f75 100755 --- a/setup_dxvk.sh +++ b/setup_dxvk.sh @@ -80,8 +80,10 @@ fi $wineboot -u win64_sys_path=$($wine64 winepath -u 'C:\windows\system32' 2> /dev/null) +win64_sys_path="${win64_sys_path/$'\r'/}" if $wow64; then win32_sys_path=$($wine winepath -u 'C:\windows\system32' 2> /dev/null) + win32_sys_path="${win32_sys_path/$'\r'/}" fi if [ -z "$win32_sys_path" ] && [ -z "$win64_sys_path" ]; then