Skip to content

Commit e80c8ee

Browse files
committed
Setup environment variable WINE_BIN as a complete replacement for WINE
1 parent ab80d85 commit e80c8ee

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/winetricks

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4442,10 +4442,7 @@ winetricks_set_wineprefix()
44424442
w_warn "Unknown file arch of ${WINESERVER_BIN}."
44434443
fi
44444444

4445-
if [ -z "${WINE_BIN}" ]; then
4446-
WINE_BIN="$(command -v "${WINE}")"
4447-
fi
4448-
_W_wine_binary_arch="$(winetricks_get_file_arch "${WINE_BIN}")"
4445+
_W_wine_binary_arch="$(winetricks_get_file_arch "${WINE}")"
44494446
if [ -z "${_W_wine_binary_arch}" ]; then
44504447
# wine might be a script calling a binary in Wine's bindir.
44514448
if [ -z "${WINE_BINDIR}" ] && [ -x "${WINEBOOT_BIN}" ]; then
@@ -4456,7 +4453,7 @@ winetricks_set_wineprefix()
44564453
fi
44574454
fi
44584455
if [ -z "${_W_wine_binary_arch}" ]; then
4459-
w_warn "Unknown file arch of ${WINE_BIN}."
4456+
w_warn "Unknown file arch of ${WINE}."
44604457
fi
44614458

44624459
# determine wow64 type (new/old)
@@ -4826,7 +4823,7 @@ winetricks_wine_setup()
48264823
W_DRIVE_C="C:/"
48274824
;;
48284825
*)
4829-
WINE="${WINE:-wine}"
4826+
WINE="${WINE:-${WINE_BIN:-wine}}”
48304827
# Find wineserver.
48314828
# Some distributions (Debian before wine 1.8-2) don't have it on the path.
48324829
for x in \

src/winetricks.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ winetricks 7zip
159159
.SH ENVIRONMENT VARIABLES
160160
Wine checks several environment variables on startup:
161161
.TP
162-
.I WINE
162+
.I WINE, WINE_BIN
163163
If set, this specifies which wine binary to use by default
164164
.TP
165165
.I WINESERVER

0 commit comments

Comments
 (0)