storm/audiogame-manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix WINEARCH preservation in wine bottle management

Browse Source 
Preserve explicitly set WINEARCH variables instead of unsetting them
in wine environment functions. This ensures that installers setting
WINEARCH="win32" are properly respected for architecture selection.

Changes:
- Remove unset WINEARCH from get_bottle() and set_wine_env()
- Add comments explaining WINEARCH preservation
- Update debug messages to show current WINEARCH value
This commit is contained in:
Hunter Jozwiak
2025-09-09 17:46:00 -04:00
parent 7ff1cd57f7
commit 5590a4cde6
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.includes/bottle.sh
View File

@@ -13,12 +13,11 @@ get_bottle() {
export WINESERVER="$wine32server" export WINESERVER="$wine32server"
# Also prepend to PATH for regular wine calls # Also prepend to PATH for regular wine calls
export PATH="${wine32%/*}:$PATH" export PATH="${wine32%/*}:$PATH"
# Unset WINEARCH to avoid conflicts with system wine # Keep WINEARCH for compatibility
unset WINEARCH echo "DEBUG: Using managed wine32 for LAUNCHER (WINE=$WINE, PATH updated)"
echo "DEBUG: Using managed wine32 for LAUNCHER (WINE=$WINE, PATH updated, WINEARCH unset)"
else else
# Clear wine variables for system wine # Clear wine variables for system wine but preserve WINEARCH if set
unset WINE WINESERVER WINEARCH unset WINE WINESERVER
echo "DEBUG: Using system wine for LAUNCHER (architecture $architecture)" echo "DEBUG: Using system wine for LAUNCHER (architecture $architecture)"
fi fi
} }
@@ -30,11 +29,12 @@ set_wine_env() {
export WINE="$wine32" export WINE="$wine32"
export WINESERVER="$wine32server" export WINESERVER="$wine32server"
export PATH="${wine32%/*}:$PATH" export PATH="${wine32%/*}:$PATH"
unset WINEARCH # Don't unset WINEARCH - preserve it for proper architecture selection
echo "DEBUG: Set wine32 environment for INSTALLATION (WINE=$WINE)" echo "DEBUG: Set wine32 environment for INSTALLATION (WINE=$WINE, WINEARCH=$WINEARCH)"
else else
unset WINE WINESERVER WINEARCH unset WINE WINESERVER
echo "DEBUG: Set system wine environment for INSTALLATION" # Don't unset WINEARCH - preserve it for proper architecture selection
echo "DEBUG: Set system wine environment for INSTALLATION (WINEARCH=$WINEARCH)"
fi fi
} }
@@ -108,6 +108,7 @@ install_wine_bottle() {
# Just set up the wine environment for game installation # Just set up the wine environment for game installation
# Determine architecture from WINEARCH or speechsdk dependency # Determine architecture from WINEARCH or speechsdk dependency
# Preserve existing WINEARCH if already set
if [[ -z "$WINEARCH" ]]; then if [[ -z "$WINEARCH" ]]; then
if [[ "$*" =~ speechsdk ]]; then if [[ "$*" =~ speechsdk ]]; then
export WINEARCH="win32" export WINEARCH="win32"