From 8e2cc52e5a54dbab19b8ab2e2aca1e0959517419 Mon Sep 17 00:00:00 2001 From: Randall Pittman Date: Wed, 8 Nov 2023 11:39:12 -0800 Subject: [PATCH] Fix #2143. Make sure the paths to the wineserver and wine binaries are used with winetricks_get_file_arch --- src/winetricks | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/winetricks b/src/winetricks index 7bff730b8..b0fd6734d 100755 --- a/src/winetricks +++ b/src/winetricks @@ -5053,8 +5053,10 @@ winetricks_set_wineprefix() if test -d "${W_DRIVE_C}/windows/syswow64"; then # Check the bitness of wineserver + wine binary, used later to determine if we're on a WOW setup (no wine64) # https://github.com/Winetricks/winetricks/issues/2030 - _W_wineserver_binary_arch="$(winetricks_get_file_arch "${WINESERVER}")" - _W_wine_binary_arch="$(winetricks_get_file_arch "${WINE}")" + WINESERVER_BIN="$(which ${WINESERVER})" + _W_wineserver_binary_arch="$(winetricks_get_file_arch "${WINESERVER_BIN}")" + WINE_BIN="$(which ${WINE})" + _W_wine_binary_arch="$(winetricks_get_file_arch "${WINE_BIN}")" # determine wow64 type (new/old) # FIXME: check what upstream is calling them