diff --git a/.includes/bottle.sh b/.includes/bottle.sh index aeac322..f7c3fb7 100644 --- a/.includes/bottle.sh +++ b/.includes/bottle.sh @@ -75,9 +75,6 @@ prepare_speechsdk_cache() { winetricks() { # Report used packages to the winetricks maintainer so he knows they are being used. 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 if [[ ! -e "${winetricksPath}/winetricks" ]]; then checkWinetricksUpdate="true" @@ -87,14 +84,14 @@ winetricks() { else if [[ "$checkWinetricksUpdate" != "true" ]]; then checkWinetricksUpdate="true" - ${winetricksPath}/winetricks --self-update + "${winetricksPath}/winetricks" --self-update fi fi # Run the requested winetricks parameters if command -v FEXLoader &> /dev/null ; then - WINE="" FEXLoader -- ${winetricksPath}/winetricks "$@" + WINE="" FEXLoader -- "${winetricksPath}/winetricks" "$@" else - ${winetricksPath}/winetricks "$@" + "${winetricksPath}/winetricks" "$@" fi } @@ -284,7 +281,7 @@ install_wine_bottle() { if [[ ${#regularDeps[@]} -gt 0 ]]; then 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..." fi @@ -292,7 +289,7 @@ install_wine_bottle() { if [[ "$needsSpeechsdk" == "true" ]]; then 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..." fi fi diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 471893d..d8a70ba 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -330,7 +330,7 @@ ensure_wine_bottles() { # Install Speech SDK for SAPI compatibility (experimental - requires WINETRICKS_FORCE=1) 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) winetricks -q win10