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

Use only self-managed winetricks. Hopefully whatever caused us to stop doing that is now fixed.

Browse Source
This commit is contained in:
Storm Dragon
2026-08-30 03:18:12 -04:00
parent edf8e8e104
commit 83dfa99aa3
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.includes/bottle.sh
+5 -8
View File
@@ -75,9 +75,6 @@ prepare_speechsdk_cache() {
winetricks() { winetricks() {
# Report used packages to the winetricks maintainer so he knows they are being used. # Report used packages to the winetricks maintainer so he knows they are being used.
enable_winetricks_usage_reporting enable_winetricks_usage_reporting
# Temporary work around for winetricks git bugs. Requires winetricks be installed from package manager.
/usr/bin/winetricks "$@"
return
# Download or update agm's copy of winetricks # Download or update agm's copy of winetricks
if [[ ! -e "${winetricksPath}/winetricks" ]]; then if [[ ! -e "${winetricksPath}/winetricks" ]]; then
checkWinetricksUpdate="true" checkWinetricksUpdate="true"
@@ -87,14 +84,14 @@ winetricks() {
else else
if [[ "$checkWinetricksUpdate" != "true" ]]; then if [[ "$checkWinetricksUpdate" != "true" ]]; then
checkWinetricksUpdate="true" checkWinetricksUpdate="true"
${winetricksPath}/winetricks --self-update "${winetricksPath}/winetricks" --self-update
fi fi
fi fi
# Run the requested winetricks parameters # Run the requested winetricks parameters
if command -v FEXLoader &> /dev/null ; then if command -v FEXLoader &> /dev/null ; then
WINE="" FEXLoader -- ${winetricksPath}/winetricks "$@" WINE="" FEXLoader -- "${winetricksPath}/winetricks" "$@"
else else
${winetricksPath}/winetricks "$@" "${winetricksPath}/winetricks" "$@"
fi fi
} }
@@ -284,7 +281,7 @@ install_wine_bottle() {
if [[ ${#regularDeps[@]} -gt 0 ]]; then if [[ ${#regularDeps[@]} -gt 0 ]]; then
echo "Installing additional dependencies: ${regularDeps[*]}" echo "Installing additional dependencies: ${regularDeps[*]}"
{ {
env WINE="$WINE" WINESERVER="$WINESERVER" DISPLAY="${DISPLAY:-:0}" winetricks -q isolate_home "${regularDeps[@]}" ${winetricksSettings} WINE="$WINE" WINESERVER="$WINESERVER" DISPLAY="${DISPLAY:-:0}" winetricks -q isolate_home "${regularDeps[@]}" ${winetricksSettings}
} | agm_progressbox "Wine Setup" "Installing additional dependencies..." } | agm_progressbox "Wine Setup" "Installing additional dependencies..."
fi fi
@@ -292,7 +289,7 @@ install_wine_bottle() {
if [[ "$needsSpeechsdk" == "true" ]]; then if [[ "$needsSpeechsdk" == "true" ]]; then
echo "Installing speechsdk with WINETRICKS_FORCE=1" echo "Installing speechsdk with WINETRICKS_FORCE=1"
{ {
env WINE="$WINE" WINESERVER="$WINESERVER" DISPLAY="${DISPLAY:-:0}" WINETRICKS_FORCE=1 winetricks -q speechsdk WINE="$WINE" WINESERVER="$WINESERVER" DISPLAY="${DISPLAY:-:0}" WINETRICKS_FORCE=1 winetricks -q speechsdk
} | agm_progressbox "Wine Setup" "Installing Speech SDK..." } | agm_progressbox "Wine Setup" "Installing Speech SDK..."
fi fi
fi fi
audiogame-manager.sh
+1 -1
View File
@@ -330,7 +330,7 @@ ensure_wine_bottles() {
# Install Speech SDK for SAPI compatibility (experimental - requires WINETRICKS_FORCE=1) # Install Speech SDK for SAPI compatibility (experimental - requires WINETRICKS_FORCE=1)
echo "# Installing Speech SDK for wine64 SAPI support..." echo "# Installing Speech SDK for wine64 SAPI support..."
env WINE="$WINE" WINESERVER="$WINESERVER" DISPLAY="${DISPLAY:-:0}" WINETRICKS_FORCE=1 winetricks -q speechsdk WINE="$WINE" WINESERVER="$WINESERVER" DISPLAY="${DISPLAY:-:0}" WINETRICKS_FORCE=1 winetricks -q speechsdk
# Restore win10 after speechsdk (speechsdk sets winxp) # Restore win10 after speechsdk (speechsdk sets winxp)
winetricks -q win10 winetricks -q win10