Setup internal used environment variable WINE with absolute wine path #2320
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jre-wine
reviewed
Jan 14, 2025
There was a problem hiding this comment.
I haven't really tested it, sorry, but if this does what you need it for, it sounds good. Just two thoughts:
Somewhere else in the code there's already
WINE_BIN="$(command -v "${WINE}")"
Doing the same thing twice seems unnecessary, could this be simplified?
AFAICT this is unnecessary or wrong here:
&& test -f "${_abswine}"
To avoid the unnecessary -f use
if test -x "${_abswine}" ; then
Or if there is a legit case where WINE is not executable but is a file use
if test -x "${_abswine}" || test -f "${_abswine}"; then
The additional check as to whether the absolute path of wine is a file is superfluous, as the executability is checked beforehand.
In the error or verbosity case this helps to see the actual wine executable used. Closes: Winetricks#2319
rhabacker
force-pushed
the
fix-2319
branch
2 times, most recently
from
e80c8ee to
b43ef60
Compare
austin987
reviewed
Jan 19, 2025
| @@ -159,7 +159,7 @@ winetricks 7zip | |||
| .SH ENVIRONMENT VARIABLES | |||
| Wine checks several environment variables on startup: | |||
| .TP | |||
| .I WINE | |||
| .I WINE, WINE_BIN | |||
There was a problem hiding this comment.
The manual should explain what each of them does / when to use them / etc.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the error or verbosity case this helps to see the actual wine executable used.
Closes: #2319