From 7eb1e2bb3e4146297095b4d664b76b05ab5176ed Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sat, 5 Feb 2022 20:54:38 -0500 Subject: [PATCH] Revert back to using system available 64 bit wine prefixes. --- audiogame-manager.sh | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 903d702..9d921a8 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -552,36 +552,14 @@ install_wine_bottle() { download 'http://dl.winehq.org/wine/wine-gecko/2.40/wine_gecko-2.40-x86.msi' geckoPath="${cache}/wine_gecko-2.40-x86.msi" fi - if [[ "${WINEARCH}" == "win32" ]]; then # This is in a brace list to pipe through dialog. { DISPLAY="" wineboot -u wine msiexec /i z:"$monoPath" /quiet wine msiexec /i z:"$geckoPath" /quiet - if [[ "${*}" =~ speechsdk ]]; then + if [[ "${*}" =~ speechsdk ]] || [[ "${WINEARCH}" == "win64" ]]; then install_rhvoice fi winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}; } | dialog --progressbox "Installing wine bottle, please wait..." -1 -1 - else - # This is in a brace list to pipe through dialog. - download "https://nashcentral.duckdns.org/projects/wine.tar.gz" - { tar xf "${cache}/wine.tar.gz" -C "${HOME}/.local/wine/" - mv "${HOME}/.local/wine/.wine/drive_c/users/user" "${HOME}/.local/wine/.wine/drive_c/users/${USER}" - if [[ "$(uname)" == "Darwin" ]]; then - gsed -i 's/"DefaultTTSRate"=dword:00000000/"DefaultTTSRate"=dword:00000005/' "${HOME}/.local/wine/.wine/user.reg" - else - sed -i 's/"DefaultTTSRate"=dword:00000000/"DefaultTTSRate"=dword:00000005/' "${HOME}/.local/wine/.wine/user.reg" - fi - mv "${HOME}/.local/wine/.wine/" "${WINEPREFIX}/" - wine64 cmd /c exit - wine msiexec /i z:"$monoPath" /quiet - wine msiexec /i z:"$geckoPath" /quiet - if [[ -z "$winVer" ]]; then - download "http://kitchen.kaldobsky.com/ttsgames/SpeechXP.exe" - winetricks -q winxp - wine "${cache}/SpeechXP.exe" /silent - fi - winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}; } | dialog --progressbox "Installing wine bottle, please wait..." -1 -1 - fi }