diff --git a/audiogame-manager.sh b/audiogame-manager.sh index bc86ac1..c88ab55 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -481,8 +481,8 @@ install_wine() { v="${v/64/x64}" # Probably wrong, so just a place holder. # If this goes wrong, bail out set -e - curl -L --output "${installationFile}" "https://www.playonlinux.com/wine/binaries/phoenicis/upstream-linux-x86/PlayOnLinux-wine-${1}-upstream-linux-${v}.tar.gz" - tar xf "${installationFile}" -C "${wineInstallationPath}" + { curl -L --output "${installationFile}" "https://www.playonlinux.com/wine/binaries/phoenicis/upstream-linux-x86/PlayOnLinux-wine-${1}-upstream-linux-${v}.tar.gz" + tar xf "${installationFile}" -C "${wineInstallationPath}"; } | dialog --progressbox "Installing $2 bit Wine version $1." -1 -1 set +e } @@ -566,7 +566,9 @@ install_wine_bottle() { geckoPath="${cache}/wine_gecko-2.40-x86.msi" fi # This is in a brace list to pipe through dialog. - { DISPLAY="" ${wine}boot -u + { echo -n "Using " + ${wine} --version + DISPLAY="" ${wine}boot -u $wine msiexec /i z:"$monoPath" /quiet $wine msiexec /i z:"$geckoPath" /quiet if [[ "${*}" =~ (speechsdk|sapi) ]]; then @@ -791,11 +793,6 @@ game_launcher() { if [[ "$game" =~ ^bokurano-daibouken\| ]]; then "${0%/*}/speech/clipboard_translator.sh" play.exe bokurano-daibouken & fi - if [[ "$game" =~ shadow-line ]]; then - find "${WINEPREFIX}/drive_c/" -type f -name 'nvdaControllerClient.dll' -exec rm -v "{}" \; - "${0%/*}/speech/clipboard_translator.sh" play_sr.exe shadow-line & - export version="7.7" - fi if [[ "$game" =~ bokurano-daibouken-3 ]]; then dictPath="$(winepath "${winePath}")" if [[ -r "${cache}/bk3-dict.dat" ]] && [[ ! -d "${dictPath}/dict" ]]; then @@ -824,6 +821,14 @@ game_launcher() { if [[ "$game" =~ sequence-storm ]]; then "${0%/*}/speech/clipboard_reader.sh" SequenceStorm & fi + if [[ "$game" =~ shadow-line ]]; then + find "${WINEPREFIX}/drive_c/" -type f -name 'nvdaControllerClient.dll' -exec rm -v "{}" \; + "${0%/*}/speech/clipboard_translator.sh" play_sr.exe shadow-line & + export version="7.7" + fi + if [[ "$game" =~ swamp ]]; then + export version="7.7" + fi if [[ "$game" =~ audiodisc ]]; then wine "$winePath\\$wineExec" exit 0 @@ -832,6 +837,9 @@ game_launcher() { wine "$winePath\\$wineExec" exit 0 fi + if [[ "$game" =~ entombed ]]; then + export version="7.7" + fi if [[ "$game" =~ rs-games ]] || [[ "$game" =~ screaming-strike-2 ]]; then pushd "$(winepath "$winePath")" wine "$wineExec" @@ -859,6 +867,8 @@ game_launcher() { else wine="$(command -v wine64)" fi + echo -n "launching " + ${wine} --version $wine start /realtime /d "${winePath}" "$wineExec" else # Figure out which wine version to use @@ -868,6 +878,8 @@ game_launcher() { else wine="$(command -v wine)" fi + echo -n "launching " + ${wine} --version $wine start /d "${winePath}" "$wineExec" /realtime fi fi @@ -1960,23 +1972,25 @@ case "${game}" in add_launcher "c:\Program Files\Endless Runner\runner.exe" ;; "Entombed") + export version="7.7" + install_wine "$version" "32" export winVer="win7" install_wine_bottle speechsdk msvcrt40 gdiplus ie7 wmp11 mf # Ok, more dotnet. LC_ALL=C DISPLAY="" winetricks -q dotnet40 xna40 - wineserver -k # Sigh. + ${wine}server -k # Sigh. download "http://blind-games.com/newentombed/EntombedSetup.exe" "https://download.microsoft.com/download/E/C/1/EC1B2340-67A0-4B87-85F0-74D987A27160/SSCERuntime-ENU.exe" "https://stormgames.wolfe.casa/downloads/Entombed.exe.config" "https://stormgames.wolfe.casa/downloads/mfplat.dll" mkdir -p "${WINEPREFIX}/drive_c/temp" pushd "${WINEPREFIX}/drive_c/temp" 7z x "${cache}/SSCERuntime-ENU.exe" - wine msiexec /i "${WINEPREFIX}/drive_c/temp/SSCERuntime_x86-ENU.msi" /q + ${wine} msiexec /i "${WINEPREFIX}/drive_c/temp/SSCERuntime_x86-ENU.msi" /q rm * popd pushd "${WINEPREFIX}/drive_c/Program Files/Microsoft SQL Server Compact Edition/v3.5" - wine regsvr32 sqlceoledb35.dll - wine regsvr32 sqlceca35.dll + ${wine} regsvr32 sqlceoledb35.dll + ${wine} regsvr32 sqlceca35.dll popd - wine "${cache}/EntombedSetup.exe" /silent + ${wine} "${cache}/EntombedSetup.exe" /silent pushd "${WINEPREFIX}/drive_c/Program Files/Entombed" cp ../Microsoft\ SQL\ Server\ Compact\ Edition/v3.5/Private/System.Data.SqlServerCe.Entity.dll ../Microsoft\ SQL\ Server\ Compact\ Edition/v3.5/Private/System.Data.SqlServerCe.dll . cp ../Microsoft\ SQL\ Server\ Compact\ Edition/v3.5/sql* . @@ -2673,6 +2687,7 @@ EOF add_launcher "c:\Program Files\Survive the Wild\stw.exe" ;; "Swamp") + export version="7.7" install_wine "${version}" "32" export bottle="aprone" export winVer="win7"