File tree Expand file tree Collapse file tree 2 files changed +4
-7
lines changed Expand file tree Collapse file tree 2 files changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -4442,10 +4442,7 @@ winetricks_set_wineprefix()
4442
4442
w_warn "Unknown file arch of ${WINESERVER_BIN}."
4443
4443
fi
4444
4444
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}")"
4449
4446
if [ -z "${_W_wine_binary_arch}" ]; then
4450
4447
# wine might be a script calling a binary in Wine's bindir.
4451
4448
if [ -z "${WINE_BINDIR}" ] && [ -x "${WINEBOOT_BIN}" ]; then
@@ -4456,7 +4453,7 @@ winetricks_set_wineprefix()
4456
4453
fi
4457
4454
fi
4458
4455
if [ -z "${_W_wine_binary_arch}" ]; then
4459
- w_warn "Unknown file arch of ${WINE_BIN }."
4456
+ w_warn "Unknown file arch of ${WINE }."
4460
4457
fi
4461
4458
4462
4459
# determine wow64 type (new/old)
@@ -4826,7 +4823,7 @@ winetricks_wine_setup()
4826
4823
W_DRIVE_C="C:/"
4827
4824
;;
4828
4825
*)
4829
- WINE="${WINE:-wine}"
4826
+ WINE="${WINE:-${WINE_BIN:- wine}}”
4830
4827
# Find wineserver.
4831
4828
# Some distributions (Debian before wine 1.8-2) don't have it on the path.
4832
4829
for x in \
Original file line number Diff line number Diff line change @@ -159,7 +159,7 @@ winetricks 7zip
159
159
.SH ENVIRONMENT VARIABLES
160
160
Wine checks several environment variables on startup:
161
161
.TP
162
- .I WINE
162
+ .I WINE, WINE_BIN
163
163
If set, this specifies which wine binary to use by default
164
164
.TP
165
165
.I WINESERVER
You can’t perform that action at this time.
0 commit comments