Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow {WINE,WINESERVER}_BIN env vars #2318

Merged
merged 1 commit into from
Jan 13, 2025
Merged

Allow {WINE,WINESERVER}_BIN env vars #2318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/winetricks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4402,7 +4402,13 @@ 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
WINESERVER_BIN="$(command -v "${WINESERVER}")"
# WINE_BIN and WINESERVER_BIN can be set outside Winetricks in case
# the `wine` and `wineserver` executables and the actual Wine binaries
# are located in different locations (usually the case for wrappers);
# this helps to avoid spurious "unknown file arch" warnings.
if [ -z "${WINESERVER_BIN}" ]; then
WINESERVER_BIN="$(command -v "${WINESERVER}")"
fi

# wineboot often is a link pointing to wineapploader in Wine's bindir. If we don't find binaries we may look for them there later
if [ -n "${READLINK_F}" ]; then
Expand Down Expand Up @@ -4436,7 +4442,9 @@ winetricks_set_wineprefix()
w_warn "Unknown file arch of ${WINESERVER_BIN}."
fi

WINE_BIN="$(command -v "${WINE}")"
if [ -z "${WINE_BIN}" ]; then
WINE_BIN="$(command -v "${WINE}")"
fi
_W_wine_binary_arch="$(winetricks_get_file_arch "${WINE_BIN}")"
if [ -z "${_W_wine_binary_arch}" ]; then
# wine might be a script calling a binary in Wine's bindir.
Expand Down
Loading