diff --git a/.includes/bottle.sh b/.includes/bottle.sh index a7ba5a7..07d2496 100644 --- a/.includes/bottle.sh +++ b/.includes/bottle.sh @@ -65,10 +65,10 @@ install_rhvoice() { fi local voiceFile="${RHVoice[${voiceName}]##*/}" download "${RHVoice[${voiceName}]}" - winetricks -q win8 + winetricks -q win8 | agm_progressbox "RHVoice Setup" "Preparing Windows environment for RHVoice..." echo "Installing RHVoice ${voiceName^}..." wine "${cache}/${voiceFile}" & - sleep 20 + sleep 20 | agm_progressbox "RHVoice Setup" "Installing RHVoice ${voiceName^} voice..." wineserver -k } @@ -109,9 +109,9 @@ install_wine_bottle() { fi echo -n "Using " wine --version - DISPLAY="" wineboot -u - wine msiexec /i z:"$monoPath" /quiet - wine msiexec /i z:"$geckoPath" /quiet + DISPLAY="" wineboot -u | agm_progressbox "Wine Setup" "Initializing wine bottle..." + wine msiexec /i z:"$monoPath" /quiet | agm_progressbox "Wine Setup" "Installing .NET Framework..." + wine msiexec /i z:"$geckoPath" /quiet | agm_progressbox "Wine Setup" "Installing Web Browser support..." if [[ "${*}" =~ (speechsdk|sapi) ]]; then install_rhvoice fi @@ -122,7 +122,7 @@ install_wine_bottle() { cp "${cache}/nvda2speechd" "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" chmod +x "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" fi - winetricks -q isolate_home "$@" "${winVer:-win7}" ${winetricksSettings} + winetricks -q isolate_home "$@" "${winVer:-win7}" ${winetricksSettings} | agm_progressbox "Wine Setup" "Installing wine dependencies..." # Set default voice for speech-enabled games if [[ ${#defaultVoice} -ge 2 ]] && [[ "$*" =~ (speechsdk|sapi) ]]; then diff --git a/.includes/functions.sh b/.includes/functions.sh index a9d0d40..9db7d64 100644 --- a/.includes/functions.sh +++ b/.includes/functions.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + # Alerts, for when user needs to read something. alert() { play -qnV0 synth 3 pluck D3 pluck A3 pluck D4 pluck F4 pluck A4 delay 0 .1 .2 .3 .4 remix - chorus 0.9 0.9 38 0.75 0.3 0.5 -t @@ -51,10 +53,10 @@ download() { fi # Skip if the item is in cache. [[ -e "${cache}/${dest}" ]] && continue - { if ! curl -L4 -C - --retry 10 --output "${cache}/${dest}" "${i}" ; then - echo "Could not download \"$i\"..." + if ! curl -L4 -C - --retry 10 --output "${cache}/${dest}" "${i}" 2>&1 | agm_progressbox "Audio Game Manager" "Downloading \"$dest\"..."; then + agm_infobox "Audio Game Manager" "Audio Game Manager" "Could not download \"$dest\". Installation cannot continue." exit 1 - fi; } | agm_progressbox "Audio Game Manager" "Downloading \"$dest\" from \"$i\"" + fi local downloadError=1 case "${dest##*.}" in "pk3"|"zip") @@ -173,3 +175,29 @@ unix2dos() { sed -i 's/\r\{0,\}$/\r/' "$file" done } + +# Progress wrapper for game installation operations +install_with_progress() { + local operation="$1" + local message="$2" + shift 2 + + case "$operation" in + "unzip") + unzip "$@" | agm_progressbox "Game Installation" "$message" + ;; + "7z") + 7z "$@" | agm_progressbox "Game Installation" "$message" + ;; + "cp"|"copy") + cp -v "$@" | agm_progressbox "Game Installation" "$message" + ;; + "find") + find "$@" | agm_progressbox "Game Installation" "$message" + ;; + *) + # Default: run command with progress box + "$operation" "$@" | agm_progressbox "Game Installation" "$message" + ;; + esac +} diff --git a/.install/A Hero's Call.sh b/.install/A Hero's Call.sh index 41aca8e..6529e17 100644 --- a/.install/A Hero's Call.sh +++ b/.install/A Hero's Call.sh @@ -5,6 +5,5 @@ install_wine_bottle speechsdk corefonts # Dotnet is evil. That is all. LC_ALL=C DISPLAY="" winetricks -q dotnet462 xna40 ${wine}server -k # Really! -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/a-heros-call-freeware.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/a-heros-call-freeware.zip" add_launcher "c:\Program Files\a-heros-call\A Hero's Call.exe" diff --git a/.install/Adventurers At C.sh b/.install/Adventurers At C.sh index 5ea7e8d..c0ef021 100644 --- a/.install/Adventurers At C.sh +++ b/.install/Adventurers At C.sh @@ -1,5 +1,5 @@ download "http://www.vgstorm.com/aac/aac.zip" "https://www.agarchive.net/games/vg/adventure%20at%20c%20stages.7z" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/aac" "${cache}/aac.zip" -7z x -o"$WINEPREFIX/drive_c/Program Files/aac/stages" "${cache}/adventure at c stages.7z" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/aac" "${cache}/aac.zip" +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/aac/stages" "${cache}/adventure at c stages.7z" add_launcher "c:\Program Files\aac\aac.exe" diff --git a/.install/Angel Gift.sh b/.install/Angel Gift.sh index 278334a..e4dfc59 100644 --- a/.install/Angel Gift.sh +++ b/.install/Angel Gift.sh @@ -1,4 +1,4 @@ download "https://erion.cf/files/ag_103.zip" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/Angel Gift" "$cache/ag_103.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/Angel Gift" "$cache/ag_103.zip" add_launcher 'c:\Program Files\Angel Gift\ag.exe' diff --git a/.install/AudioDisc.sh b/.install/AudioDisc.sh index 4b4e4dd..4cb354a 100644 --- a/.install/AudioDisc.sh +++ b/.install/AudioDisc.sh @@ -1,4 +1,4 @@ download "https://agarchive.net/games/other/audiodisc.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/audiodisc.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/audiodisc.zip" add_launcher "c:\Program Files\audiodisc\disco.exe" diff --git a/.install/AudioQuake.sh b/.install/AudioQuake.sh index 7f4f84a..db772f0 100644 --- a/.install/AudioQuake.sh +++ b/.install/AudioQuake.sh @@ -1,8 +1,8 @@ download "https://github.com/matatk/agrip/releases/download/2020.0-beta1/AudioQuake+LDL_2020.0-beta1_Windows.zip" "https://stormgames.wolfe.casa/downloads/quake.zip" export winVer="win7" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/AudioQuake+LDL_2020.0-beta1_Windows.zip" -unzip -d "$WINEPREFIX/drive_c/Program Files/AudioQuake/id1" "${cache}/quake.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/AudioQuake+LDL_2020.0-beta1_Windows.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/AudioQuake/id1" "${cache}/quake.zip" add_launcher "c:\Program Files\AudioQuake\AudioQuake.exe" echo echo "After you launch the game, press tab then enter and it should begin speaking." diff --git a/.install/Balatro.sh b/.install/Balatro.sh index df0057b..e855bba 100644 --- a/.install/Balatro.sh +++ b/.install/Balatro.sh @@ -1,10 +1,9 @@ -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" "https://stormgames.wolfe.casa/downloads/Tolk.dll" "https://github.com/Aurelius7309/BlackHole/releases/download/0.3.1/BlackHole-Release.zip" export WINEARCH=win64 export winVer="win10" install_wine_bottle get_steam "2379780" "https://store.steampowered.com/app/2379780/Balatro/" mkdir -p "$WINEPREFIX/drive_c/users/$USER/AppData/Roaming/Balatro/Mods" -unzip -d "$WINEPREFIX/drive_c/users/$USER/AppData/Roaming/Balatro" "$cache/BlackHole-Release.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/users/$USER/AppData/Roaming/Balatro" "$cache/BlackHole-Release.zip" pushd "$WINEPREFIX/drive_c/users/$USER/AppData/Roaming/Balatro/Mods" (cat mod_urls.txt ; echo) | while read -r x ; do git clone "$x" @@ -12,7 +11,5 @@ done cp -v BlackHole/bin/*.dll "$WINEPREFIX/drive_c/Program Files/Balatro" cp -v "$cache/Tolk.dll" "$WINEPREFIX/drive_c/Program Files/Balatro/tolk.dll" cp -v "$cache/Tolk.dll" BlackHole/bin/tolk.dll -cp -v "$cache/nvda2speechd64.dll" "$WINEPREFIX/drive_c/Program Files/Balatro/nvdaControllerClient64.dll" -cp -v "$cache/nvda2speechd64.dll" BlackHole/bin/nvdaControllerClient64.dll cp -v ../version.dll "$WINEPREFIX/drive_c/Program Files/Balatro" add_launcher 'c:\Program Files\Balatro\Balatro.exe' 'export WINEDLLOVERRIDES=version=n,b' diff --git a/.install/Battle Zone.sh b/.install/Battle Zone.sh index 7a12769..14a5f29 100644 --- a/.install/Battle Zone.sh +++ b/.install/Battle Zone.sh @@ -2,5 +2,4 @@ download "https://www.agarchive.net/games/gameMadnessInteractive/battle%20zone%2 export winVer="win7" install_wine_bottle speechsdk wine "${cache}/battle zone 13.5 setup.exe" /silent -find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; add_launcher "c:\Program Files\Battle Zone\ss.exe" diff --git a/.install/Battle of the Hunter.sh b/.install/Battle of the Hunter.sh index e7d465a..3658407 100644 --- a/.install/Battle of the Hunter.sh +++ b/.install/Battle of the Hunter.sh @@ -2,6 +2,5 @@ download "http://files.tunmi13.com/projects_archive/bth.zip" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/$game" "${cache}/bth.zip" -find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/$game" "${cache}/bth.zip" add_launcher "c:\Program Files\\${game}\bth.exe" diff --git a/.install/Battlefield 2D.sh b/.install/Battlefield 2D.sh index b056b0f..0a69452 100644 --- a/.install/Battlefield 2D.sh +++ b/.install/Battlefield 2D.sh @@ -1,9 +1,7 @@ get_installer "bf.zip" "https://tunmi13.itch.io/battlefield-2d" -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" export WINEARCH=win64 export winVer="win8" # Uses standard wine path based on architecture (win32/win64) install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/bf.zip" -find "${WINEPREFIX}/drive_c/Program Files/bf" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/bf.zip" add_launcher "c:\Program Files\bf\bf.exe" diff --git a/.install/Beatstar Pro.sh b/.install/Beatstar Pro.sh index 9edfe77..d3c3805 100644 --- a/.install/Beatstar Pro.sh +++ b/.install/Beatstar Pro.sh @@ -4,5 +4,5 @@ download "https://oriolgomez.com/games/beat_windows.zip" export WINEARCH=win64 export winVer="win7" install_wine_bottle mf -unzip -d "$WINEPREFIX/drive_c/Program Files/Beatstar Pro" "${cache}/beat_windows.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/Beatstar Pro" "${cache}/beat_windows.zip" add_launcher "c:\Program Files\Beatstar Pro\beatstar.exe" diff --git a/.install/Blind Drive.sh b/.install/Blind Drive.sh index 4288450..e32c49e 100644 --- a/.install/Blind Drive.sh +++ b/.install/Blind Drive.sh @@ -1,11 +1,9 @@ get_installer "Blind Drive 1.1.112.00i-win64.zip" "https://lofipeople.itch.io/blind-drive" -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" export WINEARCH=win64 export winVer="win8" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/blind-drive" "${cache}/Blind Drive 1.1.112.00i-win64.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/blind-drive" "${cache}/Blind Drive 1.1.112.00i-win64.zip" # Weird work around to get keyboard working. winetricks -q usetakefocus=y winetricks -q usetakefocus=n -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; add_launcher "c:\Program Files\blind-drive\Blind Drive.exe" diff --git a/.install/Bokurano Daibouken 2.sh b/.install/Bokurano Daibouken 2.sh index 2210988..210a102 100644 --- a/.install/Bokurano Daibouken 2.sh +++ b/.install/Bokurano Daibouken 2.sh @@ -2,6 +2,5 @@ download "https://www.nyanchangames.com/softs/nn2_setup.exe" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle -7z x -o"$WINEPREFIX/drive_c/nyanchangame/bk2" "${cache}/nn2_setup.exe" -find "${WINEPREFIX}/drive_c/nyanchangame/bk2/" -type f -name 'nvdaControllerClient.dll' -exec rm -v "{}" \; +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/nyanchangame/bk2" "${cache}/nn2_setup.exe" add_launcher "c:\nyanchangame\bk2\play.exe" diff --git a/.install/Bokurano Daibouken 3.sh b/.install/Bokurano Daibouken 3.sh index ea40ee3..669ce58 100644 --- a/.install/Bokurano Daibouken 3.sh +++ b/.install/Bokurano Daibouken 3.sh @@ -14,12 +14,10 @@ done if [[ "${#dictFile}" -ge 3 ]] && [[ ! -r "${cache}/bk3-dict.dat" ]]; then agm_yesno "Bokurano Daibouken 3" "Bokurano Daibouken 3" "Possible English translation file found at $dictFile. Would you like to use it for BK3?" && cp -v "$dictFile" "${cache}/bk3-dict.dat" fi -download "https://www.nyanchangames.com/softs/nn3_setup.exe" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle cp "${cache}/nvda2speechd" "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" chmod +x "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" -7z x -o"$WINEPREFIX/drive_c/nyanchangame/bk3" "${cache}/nn3_setup.exe" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \; +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/nyanchangame/bk3" "${cache}/nn3_setup.exe" add_launcher "c:\nyanchangame\bk3\play.exe" diff --git a/.install/Bokurano Daibouken.sh b/.install/Bokurano Daibouken.sh index 9fc8179..c5f0001 100644 --- a/.install/Bokurano Daibouken.sh +++ b/.install/Bokurano Daibouken.sh @@ -2,6 +2,5 @@ download "https://www.nyanchangames.com/softs/nn_setup.exe" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle -7z x -o"$WINEPREFIX/drive_c/nyanchangame/bk" "${cache}/nn_setup.exe" -find "${WINEPREFIX}/drive_c/nyanchangame/bk/" -type f -name 'nvdaControllerClient.dll' -exec rm -v "{}" \; +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/nyanchangame/bk" "${cache}/nn_setup.exe" add_launcher "c:\nyanchangame\bk\play.exe" diff --git a/.install/Bombercats.sh b/.install/Bombercats.sh index 91e0744..5adb37f 100644 --- a/.install/Bombercats.sh +++ b/.install/Bombercats.sh @@ -2,6 +2,5 @@ download "http://oriolgomez.com/games/bombercats_en.zip" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/bomvercats" "${cache}/bombercats_en.zip" -find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/bomvercats" "${cache}/bombercats_en.zip" add_launcher "c:\Program Files\bomvercats\game.exe" diff --git a/.install/Bop It Emulator.sh b/.install/Bop It Emulator.sh index a11abf7..d867b5b 100644 --- a/.install/Bop It Emulator.sh +++ b/.install/Bop It Emulator.sh @@ -1,5 +1,5 @@ download "http://www.masonasons.me/softs/BopItEmulator3.1PasswordIsBopIt.7z" export winVer="win7" install_wine_bottle -7z x -o"$WINEPREFIX/drive_c/Program Files/Bop It" "${cache}/BopItEmulator3.1PasswordIsBopIt.7z" -pBopIt +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/Bop It" "${cache}/BopItEmulator3.1PasswordIsBopIt.7z" -pBopIt add_launcher "c:\Program Files\Bop It\bop.exe" diff --git a/.install/Bounce Bounce.sh b/.install/Bounce Bounce.sh index 43f6b7c..6f588ae 100644 --- a/.install/Bounce Bounce.sh +++ b/.install/Bounce Bounce.sh @@ -1,7 +1,5 @@ export WINEARCH=win64 get_installer "bounce_bounce.rar" "https://kavyapriya.itch.io/bounce-bounce" -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" install_wine_bottle unrar x "${cache}/bounce_bounce.rar" -op"$WINEPREFIX/drive_c/Program Files" -find "${WINEPREFIX}/drive_c/Program Files/bounce_bounce" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; add_launcher "c:\Program Files\bounce_bounce\bounce.exe" diff --git a/.install/Breed Memorial.sh b/.install/Breed Memorial.sh index ef9c31a..5459864 100644 --- a/.install/Breed Memorial.sh +++ b/.install/Breed Memorial.sh @@ -2,6 +2,5 @@ download "https://hirotaka2014.sakura.ne.jp/mh0406/game/breed_memorial.zip" "${nvdaControllerClientDll}" export winVer="win7" install_wine_bottle cjkfonts speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/breed_memorial.zip" -#find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/breed_memorial.zip" add_launcher "c:\Program Files\Breed memorial\Breed memorial\breed memorial.exe" diff --git a/.install/Breu2 Shadow Hunt.sh b/.install/Breu2 Shadow Hunt.sh index 4b2c94d..6f11a0e 100644 --- a/.install/Breu2 Shadow Hunt.sh +++ b/.install/Breu2 Shadow Hunt.sh @@ -1,8 +1,6 @@ -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" get_installer "breu2.zip" "https://breu.itch.io/shadowhunt" export WINEARCH=win64 export winVer="win8" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/breu2.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/breu2.zip" add_launcher "c:\Program Files\breu2\breu2.exe" diff --git a/.install/Castaways 2.sh b/.install/Castaways 2.sh index 17e9f48..7e67396 100644 --- a/.install/Castaways 2.sh +++ b/.install/Castaways 2.sh @@ -2,6 +2,6 @@ download "http://www.kaldobsky.com/audiogames/castaways2beta.zip" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle vb6run dx8vb speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/castaways2" "${cache}/castaways2beta.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/castaways2" "${cache}/castaways2beta.zip" wine "c:\Program Files\castaways2\Checkup.exe" /verysilent add_launcher "c:\Program Files\castaways2\Castaways2.exe" diff --git a/.install/Castaways.sh b/.install/Castaways.sh index 48e2240..16de149 100644 --- a/.install/Castaways.sh +++ b/.install/Castaways.sh @@ -2,6 +2,6 @@ download "https://www.kaldobsky.com/audiogames/castaways.zip" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle vb6run dx8vb speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/castaways" "${cache}/castaways.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/castaways" "${cache}/castaways.zip" wine "c:\Program Files\castaways\Checkup.exe" /verysilent add_launcher "c:\Program Files\castaways\Castaways.exe" diff --git a/.install/Challenge of the Horse.sh b/.install/Challenge of the Horse.sh index a92f2c1..6d03672 100644 --- a/.install/Challenge of the Horse.sh +++ b/.install/Challenge of the Horse.sh @@ -2,6 +2,5 @@ download "http://files.tunmi13.com/projects_archive/coth.zip" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/$game" "${cache}/coth.zip" -find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/$game" "${cache}/coth.zip" add_launcher "c:\Program Files\\${game}\game.exe" diff --git a/.install/Chillingham.sh b/.install/Chillingham.sh index 7408129..992acad 100644 --- a/.install/Chillingham.sh +++ b/.install/Chillingham.sh @@ -1,4 +1,4 @@ download "https://stormgames.wolfe.casa/downloads/chillingham.zip" install_wine_bottle vb6run mfc42 -unzip -d "$WINEPREFIX/drive_c/Program Files" "$cache/chillingham.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "$cache/chillingham.zip" add_launcher "c:\Program Files\chillingham\Chillingham.exe" diff --git a/.install/Christmas Chaos.sh b/.install/Christmas Chaos.sh index b5a562f..d68c994 100644 --- a/.install/Christmas Chaos.sh +++ b/.install/Christmas Chaos.sh @@ -2,6 +2,6 @@ export WINEARCH=win64 export winVer="win7" download "${ipfsGateway}/ipfs/QmYx11vsMDBgjPd1coZPGHxMXf2qtf4icqmB3Q9iUazyQv?filename=ChristmasChaos.zip" "https://stormgames.wolfe.casa/downloads/Tolk.dll" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/ChristmasChaos.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/ChristmasChaos.zip" find "${WINEPREFIX}" -type f -name 'Tolk.dll' -exec cp -v "${cache}/Tolk.dll" "{}" \; add_launcher "c:\Program Files\ChristmasChaos\ChristmasChaos.exe" diff --git a/.install/Clashes of the Sky.sh b/.install/Clashes of the Sky.sh index 136a5a3..8875de7 100644 --- a/.install/Clashes of the Sky.sh +++ b/.install/Clashes of the Sky.sh @@ -2,6 +2,5 @@ get_installer "clashes_of_the_sky.zip" "https://tunmi13.itch.io/clashes-of-the-s # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/clashes_of_the_sky.zip" -find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/clashes_of_the_sky.zip" add_launcher 'c:\Program Files\clashes_of_the_sky\clash.exe' diff --git a/.install/Code Dungeon.sh b/.install/Code Dungeon.sh index cf1055f..1d97f17 100644 --- a/.install/Code Dungeon.sh +++ b/.install/Code Dungeon.sh @@ -1,11 +1,9 @@ get_installer "codedungeon-win-64.zip" "https://stealcase.itch.io/codedungeon" -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" export WINEARCH=win64 export winVer="win8" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/code-dungeon" "${cache}/codedungeon-win-64.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/code-dungeon" "${cache}/codedungeon-win-64.zip" # Weird work around to get keyboard working. winetricks -q usetakefocus=y winetricks -q usetakefocus=n -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; add_launcher "c:\Program Files\code-dungeon\Code Dungeon.exe" diff --git a/.install/Coin Collector.sh b/.install/Coin Collector.sh index 666ecf1..0272545 100644 --- a/.install/Coin Collector.sh +++ b/.install/Coin Collector.sh @@ -1,7 +1,5 @@ export WINEARCH=win64 export winVer="win7" -download "https://www.dropbox.com/s/v55q7t9n84otmcd/coin%20collector.rar?dl=1" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" install_wine_bottle unrar x "$cache/coin collector.rar" -op"$WINEPREFIX/drive_c/Program Files" -find "$WINEPREFIX/drive_c/Program Files/coin collector" -type f -name "nvdaControllerClient64.dll" -exec cp -v "$cache/nvda2speechd64.dll" "{}" \; add_launcher "c:\Program Files\coin collector\game.exe" diff --git a/.install/Conjury.sh b/.install/Conjury.sh index 234fd43..46c00ef 100644 --- a/.install/Conjury.sh +++ b/.install/Conjury.sh @@ -1,8 +1,5 @@ -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" export WINEARCH=win64 export winVer="win8" install_wine_bottle get_steam 2684520 "https://store.steampowered.com/app/2684520/Conjury/" -find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86_64/nvdaControllerClient.dll' -exec cp -v "$cache/nvda2speechd64.dll" "{}" \; -find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86/nvdaControllerClient.dll' -exec cp -v "$cache/nvda2speechd32.dll" "{}" \; add_launcher 'c:\Program Files\Conjury\release\Conjury.exe' diff --git a/.install/Constant Motion.sh b/.install/Constant Motion.sh index bc72f38..bd572b3 100644 --- a/.install/Constant Motion.sh +++ b/.install/Constant Motion.sh @@ -1,7 +1,5 @@ export WINEARCH=win64 export winVer="win7" -download "https://samtupy.com/games/cm.zip" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/ConstantMotion" "$cache/cm.zip" -find "$WINEPREFIX/drive_c/Program Files/ConstantMotion" -name "nvdaControllerClient64.dll" -exec cp -v "$cache/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/ConstantMotion" "$cache/cm.zip" add_launcher 'c:\Program Files\ConstantMotion\cm.exe' diff --git a/.install/Copter Mission.sh b/.install/Copter Mission.sh index c92a7a0..909adad 100644 --- a/.install/Copter Mission.sh +++ b/.install/Copter Mission.sh @@ -2,5 +2,5 @@ export winVer="win7" download "http://oriolgomez.com/games/copter_en.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/copter mission" "${cache}/copter_en.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/copter mission" "${cache}/copter_en.zip" add_launcher "c:\Program Files\copter mission\game.exe" diff --git a/.install/Crazy Party.sh b/.install/Crazy Party.sh index 53abb00..001b629 100644 --- a/.install/Crazy Party.sh +++ b/.install/Crazy Party.sh @@ -1,8 +1,6 @@ export WINEARCH=win64 export winVer="win8" -download "http://pragmapragma.free.fr/crazy-party/Crazy-Party-beta82.zip" "https://stormgames.wolfe.casa/downloads/Tolk.dll" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/Crazy-Party-beta82.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/Crazy-Party-beta82.zip" find "${WINEPREFIX}" -type f -name 'Tolk.dll' -exec cp -v "${cache}/Tolk.dll" "{}" \; -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; add_launcher "c:\Program Files\Crazy-Party-beta82\Crazy Party.exe" diff --git a/.install/Crime Hunter.sh b/.install/Crime Hunter.sh index 3f9fa78..255c1f2 100644 --- a/.install/Crime Hunter.sh +++ b/.install/Crime Hunter.sh @@ -1,7 +1,5 @@ export WINEARCH=win64 export winVer="win7" -download "http://masonasons.me/softs/CH2.0Win.zip" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/crime-hunter" "${cache}/CH2.0Win.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/crime-hunter" "${cache}/CH2.0Win.zip" add_launcher "c:\Program Files\crime-hunter\ch.exe" diff --git a/.install/Danger on the Wheel.sh b/.install/Danger on the Wheel.sh index 05f21b4..b013391 100644 --- a/.install/Danger on the Wheel.sh +++ b/.install/Danger on the Wheel.sh @@ -2,6 +2,5 @@ download "http://oriolgomez.com/games/wheel_en.zip" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/danger on the wheel" "${cache}/wheel_en.zip" -find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/danger on the wheel" "${cache}/wheel_en.zip" add_launcher "c:\Program Files\danger on the wheel\game.exe" diff --git a/.install/Daytona and the Book of Gold.sh b/.install/Daytona and the Book of Gold.sh index a5fa3b7..f9bb131 100644 --- a/.install/Daytona and the Book of Gold.sh +++ b/.install/Daytona and the Book of Gold.sh @@ -3,6 +3,6 @@ export winVer="win7" export winetricksSettings="vd=1024x768" download "https://kaldobsky.com/audiogames/Daytona.zip" install_wine_bottle vb6run dx8vb quartz corefonts -unzip -d "$WINEPREFIX/drive_c/Program Files/daytona" "${cache}/Daytona.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/daytona" "${cache}/Daytona.zip" wine 'c:\Program Files\daytona\checkup.exe' /verysilent add_launcher "c:\Program Files\daytona\Daytona.exe" diff --git a/.install/Death on the Road.sh b/.install/Death on the Road.sh index 2573437..120156c 100644 --- a/.install/Death on the Road.sh +++ b/.install/Death on the Road.sh @@ -2,5 +2,5 @@ export winVer="win7" download "http://oriolgomez.com/games/road_en.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/death on the road" "${cache}/road_en.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/death on the road" "${cache}/road_en.zip" add_launcher "c:\Program Files\death on the road\game.exe" diff --git a/.install/Dog Who Hates Toast.sh b/.install/Dog Who Hates Toast.sh index 03d13ad..dd53b72 100644 --- a/.install/Dog Who Hates Toast.sh +++ b/.install/Dog Who Hates Toast.sh @@ -3,7 +3,7 @@ export winVer="win7" export winetricksSettings="vd=1024x768" download "https://www.kaldobsky.com/audiogames/dogwhohatestoast.zip" install_wine_bottle vb6run dx8vb quartz speechsdk corefonts -unzip -d "$WINEPREFIX/drive_c/Program Files/dogwhohatestoast" "${cache}/dogwhohatestoast.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/dogwhohatestoast" "${cache}/dogwhohatestoast.zip" wine 'c:\Program Files\dogwhohatestoast\checkup.exe' /verysilent add_launcher "c:\Program Files\dogwhohatestoast\DogwhoHatesToast.exe" echo "Note: Dog who Hates Toast installed. Once you start the game, you must press tab until you hear sapi on to get speech." >&2 diff --git a/.install/Dragon Pong.sh b/.install/Dragon Pong.sh index 2d84cae..901a26d 100644 --- a/.install/Dragon Pong.sh +++ b/.install/Dragon Pong.sh @@ -2,5 +2,5 @@ export winVer="win7" install_wine_bottle download "https://www.iamtalon.me/games/dragonpong.zip" -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/dragonpong.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/dragonpong.zip" add_launcher "c:\Program Files\dragonpong\DragonPong.exe" diff --git a/.install/Endless Runner.sh b/.install/Endless Runner.sh index 6558aa3..5dcc745 100644 --- a/.install/Endless Runner.sh +++ b/.install/Endless Runner.sh @@ -1,5 +1,4 @@ download "http://www.masonasons.me/softs/EndlessRunner.7z" install_wine_bottle speechsdk -7z x -y -o"$WINEPREFIX/drive_c/Program Files/Endless Runner" "${cache}/EndlessRunner.7z" -prunner -find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; +install_with_progress 7z "Extracting game files..." x -y -o"$WINEPREFIX/drive_c/Program Files/Endless Runner" "${cache}/EndlessRunner.7z" -prunner add_launcher "c:\Program Files\Endless Runner\runner.exe" diff --git a/.install/Entombed.sh b/.install/Entombed.sh index b3a3f73..4fb7c4a 100644 --- a/.install/Entombed.sh +++ b/.install/Entombed.sh @@ -7,7 +7,7 @@ LC_ALL=C DISPLAY="" winetricks -q dotnet40 xna40 ${wine}server -k # Sigh. mkdir -p "${WINEPREFIX}/drive_c/temp" pushd "${WINEPREFIX}/drive_c/temp" -7z x "${cache}/SSCERuntime-ENU.exe" +install_with_progress 7z "Extracting game files..." x "${cache}/SSCERuntime-ENU.exe" ${wine} msiexec /i "${WINEPREFIX}/drive_c/temp/SSCERuntime_x86-ENU.msi" /q rm * popd diff --git a/.install/Eurofly.sh b/.install/Eurofly.sh index b6b47a7..6073dcf 100644 --- a/.install/Eurofly.sh +++ b/.install/Eurofly.sh @@ -4,6 +4,6 @@ export winetricksSettings="vd=1024x768" download "https://www.stefankiss.sk/files/eurofly2/Launcher_1.2.zip" "https://www.stefankiss.sk/files/eurofly2/Eurofly_2_ful_setup.exe" install_wine_bottle speechsdk comctl32 wine "${cache}/Eurofly_2_ful_setup.exe" /silent -unzip -o -d "$WINEPREFIX/drive_c/Eurofly" "${cache}/Launcher_1.2.zip" +install_with_progress unzip "Extracting game files..." -o -d "$WINEPREFIX/drive_c/Eurofly" "${cache}/Launcher_1.2.zip" add_launcher "c:\Eurofly\launcher.exe" echo "Note: On first and sometimes later launch, Eurofly may take a very long time to download required files, please be patient..." diff --git a/.install/Executioner's Rage.sh b/.install/Executioner's Rage.sh index e078946..0aabd61 100644 --- a/.install/Executioner's Rage.sh +++ b/.install/Executioner's Rage.sh @@ -1,9 +1,7 @@ -download "https://dl.tweesecake.app/rage/rage1.5.0.zip" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" export WINEARCH=win64 export winVer="win10" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/rage1.5.0.zip" -find "${WINEPREFIX}/drive_c/Program Files" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/rage1.5.0.zip" add_launcher "c:\Program Files\rage\rage.exe" url="https://techcake.games/games/executioners-rage/" echo "Before you can login, you need to create an account at:" diff --git a/.install/Extant.sh b/.install/Extant.sh index a93028d..ac5a4a7 100644 --- a/.install/Extant.sh +++ b/.install/Extant.sh @@ -1,4 +1,4 @@ download "https://agarchive.net/games/other/extant.zip" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/extant" "${cache}/extant.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/extant" "${cache}/extant.zip" add_launcher "c:\Program Files\extant\Extant.exe" diff --git a/.install/Fuck That Bird.sh b/.install/Fuck That Bird.sh index 0f1a15e..68d1fe8 100644 --- a/.install/Fuck That Bird.sh +++ b/.install/Fuck That Bird.sh @@ -2,5 +2,5 @@ export winVer="win7" download "http://oriolgomez.com/games/bird_en.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/fuck that bird" "${cache}/bird_en.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/fuck that bird" "${cache}/bird_en.zip" add_launcher "c:\Program Files\fuck that bird\game.exe" diff --git a/.install/Galactic Strike.sh b/.install/Galactic Strike.sh index db17486..98426cb 100644 --- a/.install/Galactic Strike.sh +++ b/.install/Galactic Strike.sh @@ -1,7 +1,7 @@ get_installer "Galactic Strike 1.2.zip" "https://fusion-forged-games.itch.io/galactic-strike" export winVer="win10" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/Galactic Strike" "${cache}/Galactic Strike 1.2.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/Galactic Strike" "${cache}/Galactic Strike 1.2.zip" add_launcher "c:\Program Files\Galactic Strike\Galactic Strike.exe" echo "Use controls wasd to movi and navigate the menu." echo "Use m to fire and select items from the menu." diff --git a/.install/Grizzly Gulch.sh b/.install/Grizzly Gulch.sh index 834b374..998b1e1 100644 --- a/.install/Grizzly Gulch.sh +++ b/.install/Grizzly Gulch.sh @@ -1,6 +1,6 @@ download "https://stormgames.wolfe.casa/downloads/grizzly-gulch.zip" install_wine_bottle vb6run mfc42 -unzip -d "$WINEPREFIX/drive_c/Program Files" "$cache/grizzly-gulch.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "$cache/grizzly-gulch.zip" add_launcher "c:\Program Files\grizzly-gulch\Grizzly Gulch.exe" echo "If the combat sequences happen too slow for your tastes, while in the town square, you can use f12 to turn up the combat speed and f11 to lower it." alert diff --git a/.install/Hammer of Glory.sh b/.install/Hammer of Glory.sh index 645b328..f0bd826 100644 --- a/.install/Hammer of Glory.sh +++ b/.install/Hammer of Glory.sh @@ -2,6 +2,5 @@ export winVer="win7" download "http://oriolgomez.com/games/hammer_en.zip" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/hammer of glory" "${cache}/hammer_en.zip" -find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/hammer of glory" "${cache}/hammer_en.zip" add_launcher "c:\Program Files\hammer of glory\game.exe" diff --git a/.install/Hunter.sh b/.install/Hunter.sh index ced7ec7..66c2746 100644 --- a/.install/Hunter.sh +++ b/.install/Hunter.sh @@ -7,7 +7,7 @@ wine "${cache}/HunterSetup.exe" /silent & xdotool sleep 10 key --clearmodifiers alt+y 2> /dev/null sleep 30 && ${wine}server -k # Sometimes the installer finishes but the ${wine}server has more processes that don't exit, so we can't depend on ${wine}server -w. mkdir -p "$WINEPREFIX/drive_c/Program Files/bsc-key-generator" -7z x -o"$WINEPREFIX/drive_c/Program Files/bsc-key-generator" "${cache}/BSC unlock code generator.7z" +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/bsc-key-generator" "${cache}/BSC unlock code generator.7z" echo "$USER"$'\n'"$(hostname)"$'\n'"none"$'\n'"US" > "$WINEPREFIX/drive_c/Program Files/Hunter/config.dat" unix2dos "$WINEPREFIX/drive_c/Program Files/Hunter/config.dat" if command -v xclip &> /dev/null && command -v xdotool &> /dev/null ; then diff --git a/.install/Inquisitor's Heartbeat.sh b/.install/Inquisitor's Heartbeat.sh index cd45831..06c6c49 100644 --- a/.install/Inquisitor's Heartbeat.sh +++ b/.install/Inquisitor's Heartbeat.sh @@ -2,7 +2,7 @@ get_installer "Inquisitor_windows_ENG.zip" "https://www.audiogame.store/en/produ export WINEARCH=win64 export winVer="win8" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/Inquisitor_windows_ENG.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/Inquisitor_windows_ENG.zip" # Weird work around to get keyboard working. winetricks -q usetakefocus=y winetricks -q usetakefocus=n diff --git a/.install/Insect Therapy.sh b/.install/Insect Therapy.sh index 313aa0b..22316a5 100644 --- a/.install/Insect Therapy.sh +++ b/.install/Insect Therapy.sh @@ -2,5 +2,5 @@ export winVer="win7" download "http://oriolgomez.com/games/insect_en.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/insect therapy" "${cache}/insect_en.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/insect therapy" "${cache}/insect_en.zip" add_launcher "c:\Program Files\insect therapy\game.exe" diff --git a/.install/Laser Breakout.sh b/.install/Laser Breakout.sh index 8266a4d..161ccc0 100644 --- a/.install/Laser Breakout.sh +++ b/.install/Laser Breakout.sh @@ -1,9 +1,7 @@ # Currently only speaks in japanese, looking to see if we can find an english version. # Uses standard wine path based on architecture (win32/win64) export winVer="win7" -download "https://www.agarchive.net/games/nyanchan/laser%20breakout.7z" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" "https://stormgames.wolfe.casa/downloads/laser-breakout-options.dat" install_wine_bottle -7z x -o"$WINEPREFIX/drive_c/nyanchangame/" "$cache/laser breakout.7z" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \; +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/nyanchangame/" "$cache/laser breakout.7z" cp -v "$cache/laser-breakout-options.dat" "$WINEPREFIX/drive_c/nyanchangame/laser breakout/options.dat" add_launcher "c:\nyanchangame\laser breakout\play.exe" diff --git a/.install/Light Battles.sh b/.install/Light Battles.sh index 2c6cbfc..77e077b 100644 --- a/.install/Light Battles.sh +++ b/.install/Light Battles.sh @@ -1,6 +1,4 @@ export winVer="win7" -download "https://prometheus-enterprises.com/games/CoL.exe" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" install_wine_bottle -7z x -o"$WINEPREFIX/drive_c/Program Files/Light Battles" "${cache}/CoL.exe" -find "${WINEPREFIX}" -type f -name "nvdaControllerClient.dll" -exec cp -v "$cache/nvda2speechd32.dll" "{}" \; +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/Light Battles" "${cache}/CoL.exe" add_launcher "c:\Program Files\Light Battles\battles.exe" diff --git a/.install/Lost.sh b/.install/Lost.sh index 7a24330..1f54ccc 100644 --- a/.install/Lost.sh +++ b/.install/Lost.sh @@ -1,6 +1,5 @@ # Uses standard wine path based on architecture (win32/win64) download "https://agarchive.net/games/danZ/lost.zip" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/lost" "$cache/lost.zip" -find "$WINEPREFIX/drive_c/Program Files/lost" -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/lost" "$cache/lost.zip" add_launcher 'c:\Program Files\lost\lost.exe' diff --git a/.install/Lunimals.sh b/.install/Lunimals.sh index 901d25e..1aabfd9 100644 --- a/.install/Lunimals.sh +++ b/.install/Lunimals.sh @@ -3,7 +3,7 @@ export winVer="win7" export winetricksSettings="vd=1024x768" download "https://kaldobsky.com/audiogames/lunimals.zip" install_wine_bottle vb6run dx8vb quartz speechsdk corefonts -unzip -d "$WINEPREFIX/drive_c/Program Files/lunimals" "${cache}/lunimals.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/lunimals" "${cache}/lunimals.zip" wine 'c:\Program Files\lunimals\checkup.exe' /verysilent add_launcher "c:\Program Files\lunimals\Lunimals.exe" echo "Note: Lunimals installed. Once you start the game, you must press tab until you hear sapi on to get speech." >&2 diff --git a/.install/Marina Break.sh b/.install/Marina Break.sh index 6a46527..4e4bd28 100644 --- a/.install/Marina Break.sh +++ b/.install/Marina Break.sh @@ -1,10 +1,8 @@ # # Uses standard wine path based on architecture (win32/win64) export winVer="win7" -download "https://www.nyanchangames.com/softs/MbSetupE.exe" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" install_wine_bottle speechsdk wine "${cache}/MbSetupE.exe" & xdotool sleep 10 key Return ${wine}server -w -find "${WINEPREFIX}" -type f -name "nvdaControllerClient.dll" -exec cp -v "$cache/nvda2speechd32.dll" "{}" \; add_launcher "c:\nyanchangame\MarinaBreak\marinabreak.exe" diff --git a/.install/Mist World.sh b/.install/Mist World.sh index 82de3a3..6fda612 100644 --- a/.install/Mist World.sh +++ b/.install/Mist World.sh @@ -1,11 +1,9 @@ export winVer="win7" get_installer "Mist World_Setup.exe" "https://drive.google.com/uc?export=download&id=12YeUqorkkMT46ZSR5pcfWxSY8DHOLxZ-" -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" install_wine_bottle sapi -7z x -o"$WINEPREFIX/drive_c/Program Files/Mist World" "$cache/Mist World_Setup.exe" +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/Mist World" "$cache/Mist World_Setup.exe" sed -i 's/1024m/768m/g' "$WINEPREFIX/drive_c/Program Files/Mist World/mw.exe.vmoptions" cp "$WINEPREFIX/drive_c/Program Files/Mist World/"{mw.exe.vmoptions,update.exe.vmoptions} -find "$WINEPREFIX/drive_c/Program Files/Mist World" -iname "nvdaControllerClient32.dll" -exec cp "$cache/nvda2speechd32.dll" "{}" \; mkdir "$WINEPREFIX/drive_c/Program Files/Mist World/"{user,users} add_launcher 'c:\Program Files\Mist World\mw.exe' echo diff --git a/.install/Oh Shit.sh b/.install/Oh Shit.sh index 89d2a2a..97b9373 100644 --- a/.install/Oh Shit.sh +++ b/.install/Oh Shit.sh @@ -1,8 +1,5 @@ export winVer="win7" export norh="true" # Requires sapi even though uses nvda -download "${ipfsGateway}/ipfs/QmQnAJJrt5uABFziQc7enXYrJ74J9GKQSMi8Ry8ebsxfPV?filename=OhShit.zip" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/OhShit.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \; -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/OhShit.zip" add_launcher "c:\Program Files\oh_shit\OhShit.exe" diff --git a/.install/Operation BlackSquare.sh b/.install/Operation BlackSquare.sh index 35b6ef2..922e06d 100644 --- a/.install/Operation BlackSquare.sh +++ b/.install/Operation BlackSquare.sh @@ -1,5 +1,5 @@ export winVer="win7" download "https://www.iamtalon.me/games/blacksquare.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/blacksquare.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/blacksquare.zip" add_launcher "c:\Program Files\blacksquare\OperationBlackSquare.exe" diff --git a/.install/Paw Prints.sh b/.install/Paw Prints.sh index 60fb203..6378568 100644 --- a/.install/Paw Prints.sh +++ b/.install/Paw Prints.sh @@ -3,6 +3,6 @@ export winVer="win7" export winetricksSettings="vd=1024x768" download "https://www.kaldobsky.com/audiogames/pawprints.zip" install_wine_bottle vb6run dx8vb quartz speechsdk corefonts -unzip -d "$WINEPREFIX/drive_c/Program Files/pawprints" "${cache}/pawprints.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/pawprints" "${cache}/pawprints.zip" wine 'c:\Program Files\pawprints\checkup.exe' /verysilent add_launcher "c:\Program Files\pawprints\PawPrints.exe" diff --git a/.install/Penta Path.sh b/.install/Penta Path.sh index 50a243e..ad7a782 100644 --- a/.install/Penta Path.sh +++ b/.install/Penta Path.sh @@ -3,6 +3,6 @@ export winVer="win7" export winetricksSettings="vd=1024x768" download "http://www.kaldobsky.com/audiogames/pentapath.zip" install_wine_bottle vb6run dx8vb quartz speechsdk corefonts -unzip -d "$WINEPREFIX/drive_c/Program Files/pentapath" "${cache}/pentapath.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/pentapath" "${cache}/pentapath.zip" wine 'c:\Program Files\pentapath\checkup.exe' /verysilent add_launcher "c:\Program Files\pentapath\PentaPath.exe" diff --git a/.install/Pipe 2 Blast Chamber.sh b/.install/Pipe 2 Blast Chamber.sh index d3616ba..10c2b63 100644 --- a/.install/Pipe 2 Blast Chamber.sh +++ b/.install/Pipe 2 Blast Chamber.sh @@ -7,7 +7,7 @@ wine "${cache}/BlastChamberSetup.exe" /silent & xdotool sleep 10 key --clearmodifiers alt+y 2> /dev/null sleep 30 && ${wine}server -k # Sometimes the installer finishes but the ${wine}server has more processes that don't exit, so we can't depend on ${wine}server -w. mkdir -p "$WINEPREFIX/drive_c/Program Files/bsc-key-generator" -7z x -o"$WINEPREFIX/drive_c/Program Files/bsc-key-generator" "${cache}/BSC unlock code generator.7z" +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/bsc-key-generator" "${cache}/BSC unlock code generator.7z" echo "$USER"$'\n'"$(hostname)"$'\n'"none"$'\n'"US" > "$WINEPREFIX/drive_c/Program Files/Blast Chamber/config.dat" unix2dos "$WINEPREFIX/drive_c/Program Files/Blast Chamber/config.dat" if command -v xclip &> /dev/null && command -v xdotool &> /dev/null ; then diff --git a/.install/Preludeamals.sh b/.install/Preludeamals.sh index 72daa46..e50042b 100644 --- a/.install/Preludeamals.sh +++ b/.install/Preludeamals.sh @@ -3,6 +3,6 @@ export winVer="win7" export winetricksSettings="vd=1024x768" download "https://www.kaldobsky.com/audiogames/Preludeamals.zip" install_wine_bottle vb6run dx8vb quartz speechsdk corefonts -unzip -d "$WINEPREFIX/drive_c/Program Files/preludeamals" "${cache}/Preludeamals.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/preludeamals" "${cache}/Preludeamals.zip" wine 'c:\Program Files\preludeamals\checkup.exe' /verysilent add_launcher "c:\Program Files\preludeamals\Preludeamals.exe" diff --git a/.install/Puzzle Divided.sh b/.install/Puzzle Divided.sh index 3b43880..785c7ea 100644 --- a/.install/Puzzle Divided.sh +++ b/.install/Puzzle Divided.sh @@ -3,5 +3,5 @@ export winVer="win7" export winetricksSettings="vd=1024x768" download "https://www.kaldobsky.com/audiogames/puzzledivided.zip" install_wine_bottle vb6run dx8vb quartz corefonts -unzip -d "$WINEPREFIX/drive_c/Program Files/puzzledivided" "${cache}/puzzledivided.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/puzzledivided" "${cache}/puzzledivided.zip" add_launcher "c:\Program Files\puzzledivided\PuzzleDivided.exe" diff --git a/.install/RS Games.sh b/.install/RS Games.sh index c9e5fa4..e186a2d 100644 --- a/.install/RS Games.sh +++ b/.install/RS Games.sh @@ -1,5 +1,4 @@ download "http://rsgames.org/rsdownloads/rsgclient/rsgames-client-setup-2.01.exe" "${nvdaControllerClientDll}" install_wine_bottle speechsdk ${wine} "${cache}/rsgames-client-setup-2.01.exe" /silent -find "${WINEPREFIX}/drive_c/Program Files/RS Games Client" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; add_launcher "c:\Program Files\RS Games Client\rsg.exe" diff --git a/.install/Rettou.sh b/.install/Rettou.sh index 7a12391..a2ff952 100644 --- a/.install/Rettou.sh +++ b/.install/Rettou.sh @@ -3,5 +3,5 @@ export winVer="win7" export winetricksSettings="vd=1024x768" download "http://www.kaldobsky.com/audiogames/rettou.zip" install_wine_bottle vb6run dx8vb quartz speechsdk corefonts -unzip -d "$WINEPREFIX/drive_c/Program Files/rettou" "${cache}/rettou.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/rettou" "${cache}/rettou.zip" add_launcher "c:\Program Files\rettou\Rettou.exe" diff --git a/.install/Revelation.sh b/.install/Revelation.sh index 31a1aed..a68ac25 100644 --- a/.install/Revelation.sh +++ b/.install/Revelation.sh @@ -3,5 +3,5 @@ export winVer="win7" export winetricksSettings="vd=1024x768" download "https://www.kaldobsky.com/audiogames/revelation.zip" install_wine_bottle vb6run dx8vb quartz speechsdk corefonts -unzip -d "$WINEPREFIX/drive_c/Program Files/revelation" "${cache}/revelation.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/revelation" "${cache}/revelation.zip" add_launcher "c:\Program Files\revelation\Revelation.exe" diff --git a/.install/Rhythm Rage.sh b/.install/Rhythm Rage.sh index 0645465..eba00cb 100644 --- a/.install/Rhythm Rage.sh +++ b/.install/Rhythm Rage.sh @@ -2,6 +2,5 @@ export winVer="win7" download "http://oriolgomez.com/games/rr_en.zip" "${nvdaControllerClientDll}" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/rhythm rage" "${cache}/rr_en.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/rhythm rage" "${cache}/rr_en.zip" add_launcher "c:\Program Files\rhythm rage\game.exe" diff --git a/.install/Road to Rage Offline.sh b/.install/Road to Rage Offline.sh index 783432a..ac06de5 100644 --- a/.install/Road to Rage Offline.sh +++ b/.install/Road to Rage Offline.sh @@ -1,6 +1,5 @@ export winVer="win7" download "https://agarchive.net/games/talon/the%20road%20to%20rage%20offline.7z" install_wine_bottle speechsdk -7z x -o"$WINEPREFIX/drive_c/Program Files" "${cache}/the road to rage offline.7z" -find "${WINEPREFIX}" -type f -name "nvdaControllerClient.dll" -exec rm -fv "{}" \; +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files" "${cache}/the road to rage offline.7z" add_launcher "c:\Program Files\RTR Offline\rtr.exe" diff --git a/.install/Road to Rage.sh b/.install/Road to Rage.sh index 130aeea..a441cb4 100644 --- a/.install/Road to Rage.sh +++ b/.install/Road to Rage.sh @@ -2,5 +2,5 @@ export WINEARCH=win64 export winVer="win7" download "https://iamtalon.me/games/rtr_ultimate.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/rtr_ultimate.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/rtr_ultimate.zip" add_launcher "c:\Program Files\rtr_Ultimate\trtr.exe" diff --git a/.install/Run For Your Life.sh b/.install/Run For Your Life.sh index fa5cbd9..65724d4 100644 --- a/.install/Run For Your Life.sh +++ b/.install/Run For Your Life.sh @@ -2,5 +2,5 @@ export winVer="win7" download "http://oriolgomez.com/games/rfyl_en.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/run for your life" "${cache}/rfyl_en.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/run for your life" "${cache}/rfyl_en.zip" add_launcher "c:\Program Files\run for your life\game.exe" diff --git a/.install/Sammy Center.sh b/.install/Sammy Center.sh index ab3bcd0..72024dd 100644 --- a/.install/Sammy Center.sh +++ b/.install/Sammy Center.sh @@ -3,5 +3,4 @@ export winVer="win7" download "http://www.samtupy.com/games/SCSetup.exe" "${nvdaControllerClientDll}" install_wine_bottle speechsdk wine "${cache}/SCSetup.exe" /silent -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; add_launcher "c:\Program Files\Sam Tupy\SammyCenter\SammyCenter.exe" diff --git a/.install/Scramble!.sh b/.install/Scramble!.sh index 1e5533a..899af8a 100644 --- a/.install/Scramble!.sh +++ b/.install/Scramble!.sh @@ -1,9 +1,7 @@ winetricksSettings="vd=1024x768" export winVer="win7" -download "https://stevend.net/downloads/scramble_win32.zip" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/scramble_win32.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/scramble_win32.zip" echo "Note: When you first start the game, it will say that tts initialization failed. Please answer that you do not want to attempt initialization of tts when the game starts to allow easy speech through speech dispatcher." alert add_launcher "c:\Program Files\scramble_win32\scramble.exe" diff --git a/.install/Screaming Strike 2.sh b/.install/Screaming Strike 2.sh index 969b845..52ab146 100644 --- a/.install/Screaming Strike 2.sh +++ b/.install/Screaming Strike 2.sh @@ -5,5 +5,4 @@ install_wine_bottle fakejapanese speechsdk wine "${cache}/screamingStrike2.exe" & xdotool sleep 10 key Return ${wine}server -w -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; add_launcher "c:\nyanchangame\Screaming Strike 2\play.exe" diff --git a/.install/Scrolling Battles.sh b/.install/Scrolling Battles.sh index 36ef1f3..85a1ab4 100644 --- a/.install/Scrolling Battles.sh +++ b/.install/Scrolling Battles.sh @@ -3,6 +3,6 @@ export winVer="win7" get_installer "sbrw-win.zip" "https://masonasons.itch.io/sbrw" download "https://stormgames.wolfe.casa/downloads/Tolk.dll" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/sbrw" "${cache}/sbrw-win.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/sbrw" "${cache}/sbrw-win.zip" find "${WINEPREFIX}" -type f -name 'Tolk.dll' -exec cp -v "${cache}/Tolk.dll" "{}" \; add_launcher "c:\Program Files\sbrw\sb.exe" diff --git a/.install/Sequence Storm.sh b/.install/Sequence Storm.sh index 08e74c2..18b2454 100644 --- a/.install/Sequence Storm.sh +++ b/.install/Sequence Storm.sh @@ -2,7 +2,7 @@ get_installer "sequence-storm-win64.zip" "https://special-magic-games-llc.itch.i export WINEARCH=win64 export winVer="win10" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/sequence-storm" "${cache}/sequence-storm-win64.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/sequence-storm" "${cache}/sequence-storm-win64.zip" write_sequence_storm_reader curl -L --output "$WINEPREFIX/drive_c/Program Files/sequence-storm/settings.json" "https://stormgames.wolfe.casa/downloads/sequencestorm-settings.json" add_launcher "c:\Program Files\sequence-storm\SequenceStorm.exe" diff --git a/.install/Shooter.sh b/.install/Shooter.sh index 691dc73..72802be 100644 --- a/.install/Shooter.sh +++ b/.install/Shooter.sh @@ -1,8 +1,6 @@ export WINEARCH=win64 export winVer="win7" get_installer "shooter-win.zip" "https://brynify.itch.io/shooter" -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/shooter" "${cache}/shooter-win.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/shooter" "${cache}/shooter-win.zip" add_launcher "c:\Program Files\shooter\shooter.exe" diff --git a/.install/Side Party.sh b/.install/Side Party.sh index 52036f8..7c861e9 100644 --- a/.install/Side Party.sh +++ b/.install/Side Party.sh @@ -4,11 +4,9 @@ source "${0%/*}/../.includes/dialog-interface.sh" export WINEARCH=win64 export winVer="win7" get_installer "sideparty-win.zip" "https://masonasons.itch.io/sideparty" -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" \ "https://stormgames.wolfe.casa/downloads/SidePartySettings.dat" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/Side Party" "${cache}/sideparty-win.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/Side Party" "${cache}/sideparty-win.zip" add_launcher "c:\Program Files\Side Party\SideParty.exe" alert sidePartyUser="$(agm_inputbox "Side Party Installation" "Side Party Installation" "Please enter a user name for Side Party score board:" "")" diff --git a/.install/Simple Fighter.sh b/.install/Simple Fighter.sh index 1f08087..c9f6faa 100644 --- a/.install/Simple Fighter.sh +++ b/.install/Simple Fighter.sh @@ -6,7 +6,6 @@ if [[ ! -r "${cache}/simple-fighter-sounds.7z" ]] && [[ ! -r "${cache}/sounds.7z mv "${cache}/sounds.7z" "${cache}/simple-fighter-sounds.7z" fi install_wine_bottle -7z x -o"$WINEPREFIX/drive_c/Program Files/simple fighter" "${cache}/simple fighter.exe" -7z x -o"$WINEPREFIX/drive_c/Program Files/simple fighter/sounds" "${cache}/simple-fighter-sounds.7z" -find "${WINEPREFIX}/drive_c/Program Files/bf" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/simple fighter" "${cache}/simple fighter.exe" +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/simple fighter/sounds" "${cache}/simple-fighter-sounds.7z" add_launcher "c:\Program Files\simple fighter\game.exe" diff --git a/.install/Skateboarder Pro.sh b/.install/Skateboarder Pro.sh index e926253..41e4080 100644 --- a/.install/Skateboarder Pro.sh +++ b/.install/Skateboarder Pro.sh @@ -1,8 +1,6 @@ -download "https://tunmi13.com/projects/sb_pro_rw.zip" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" export WINEARCH=win64 export winVer="win8" # No custom bottle - use standard wine64 path install_wine_bottle sapi -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/sb_pro_rw.zip" -find "${WINEPREFIX}/drive_c/Program Files/sb_pro_rw" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting Skateboarder Pro..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/sb_pro_rw.zip" add_launcher "c:\Program Files\sb_pro_rw\sb_pro.exe" diff --git a/.install/Sketchbook.sh b/.install/Sketchbook.sh index e5bf662..8d7b7cd 100644 --- a/.install/Sketchbook.sh +++ b/.install/Sketchbook.sh @@ -2,7 +2,6 @@ export winVer="win7" download "http://sbyw.games/SBYW/SBYW.zip" "http://sbyw.games/SBYW/sounds.zip" "${nvdaControllerClientDll}" install_wine_bottle speechsdk mv -v "${cache}/sounds.zip" "${cache}/SBYW-sounds.zip" -unzip -d "$WINEPREFIX/drive_c/Program Files/sketchbook" "${cache}/SBYW.zip" -unzip -d "$WINEPREFIX/drive_c/Program Files/sketchbook" "${cache}/SBYW-sounds.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/sketchbook" "${cache}/SBYW.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/sketchbook" "${cache}/SBYW-sounds.zip" add_launcher "c:\Program Files\sketchbook\SBYW.exe" diff --git a/.install/Slender Lost Vision.sh b/.install/Slender Lost Vision.sh index 2b4fcd5..51b72f3 100644 --- a/.install/Slender Lost Vision.sh +++ b/.install/Slender Lost Vision.sh @@ -1,23 +1,19 @@ export winVer="win7" download "https://www.iamtalon.me/games/slender.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/slender.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/slender.zip" add_launcher "c:\Program Files\slender\slender.exe" "Shooter") export WINEARCH=win64 export winVer="win7" get_installer "shooter-win.zip" "https://brynify.itch.io/shooter" -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/shooter" "${cache}/shooter-win.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/shooter" "${cache}/shooter-win.zip" add_launcher "c:\Program Files\shooter\shooter.exe" "Skateboarder Pro") -download "https://tunmi13.com/projects/sb_pro_rw.zip" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" export WINEARCH=win64 export winVer="win8" # Uses standard wine path based on architecture (win32/win64) install_wine_bottle sapi -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/sb_pro_rw.zip" -find "${WINEPREFIX}/drive_c/Program Files/sb_pro_rw" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/sb_pro_rw.zip" add_launcher "c:\Program Files\sb_pro_rw\sb_pro.exe" diff --git a/.install/Smashathon.sh b/.install/Smashathon.sh index 3048b6c..fa97345 100644 --- a/.install/Smashathon.sh +++ b/.install/Smashathon.sh @@ -1,5 +1,5 @@ # Uses standard wine path based on architecture (win32/win64) download "https://agarchive.net/games/lworks/Smashathon0.02.zip" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files" "$cache/Smashathon0.02.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "$cache/Smashathon0.02.zip" add_launcher 'c:\Program Files\Smashathon0.02\smashathon.exe' diff --git a/.install/Sonic Zoom.sh b/.install/Sonic Zoom.sh index e78f2cc..d853b2a 100644 --- a/.install/Sonic Zoom.sh +++ b/.install/Sonic Zoom.sh @@ -1,15 +1,14 @@ export winVer="win7" download "http://wwwx.cs.unc.edu/Research/assist/et/projects/SonicZoom/soniczoom11.zip" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/soniczoom11.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/soniczoom11.zip" add_launcher "c:\Program Files\Sonic Zoom\SonicZoom.exe" "Space Defender") export WINEARCH="win64" export winVer="win7" download "http://tunmi13.ddns.net/projects/space_defender.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient64.dll" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/space_defender.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvdaControllerClient64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/space_defender.zip" add_launcher "c:\Program Files\space_defender\sdefender.exe" "Star Treck Final Conflict") download "https://agarchive.net/games/USA/star%20trek%20final%20conflict%20Setup.exe" diff --git a/.install/Sonic the Hedgehog.sh b/.install/Sonic the Hedgehog.sh index 5c041aa..3beb8c8 100644 --- a/.install/Sonic the Hedgehog.sh +++ b/.install/Sonic the Hedgehog.sh @@ -1,5 +1,5 @@ export winVer="win7" download "https://www.agarchive.net/games/jeqoconGames/sonic%20the%20hedgehog.7z" install_wine_bottle speechsdk -7z x -o"$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog" "${cache}/sonic the hedgehog.7z" +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog" "${cache}/sonic the hedgehog.7z" add_launcher "c:\Program Files\Sonic the Hedgehog\sth.exe" diff --git a/.install/Super Deekout.sh b/.install/Super Deekout.sh index dd5b1f8..8a1c46c 100644 --- a/.install/Super Deekout.sh +++ b/.install/Super Deekout.sh @@ -13,7 +13,7 @@ xdotool key --delay 250 alt+i 2> /dev/null xdotool sleep 15 key --delay 250 alt+f 2> /dev/null xdotool sleep 3 key --delay 250 n 2> /dev/null ${wine}server -k -7z x -y -o"$WINEPREFIX/drive_c/Program Files/Super Deekout" "${cache}/sd_full.exe" +install_with_progress 7z "Extracting game files..." x -y -o"$WINEPREFIX/drive_c/Program Files/Super Deekout" "${cache}/sd_full.exe" echo "Super Deekout needs some information before it will run:" alert read -erp "Please enter your first name: " fname diff --git a/.install/Super Mario Bros.sh b/.install/Super Mario Bros.sh index baccca8..413a275 100644 --- a/.install/Super Mario Bros.sh +++ b/.install/Super Mario Bros.sh @@ -1,5 +1,5 @@ export winVer="win7" download "https://www.agarchive.net/games/jeqoconGames/super%20mario%20bros.7z" install_wine_bottle speechsdk -7z x -o"$WINEPREFIX/drive_c/Program Files/Super Mario Bros" "${cache}/super mario bros.7z" +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/Super Mario Bros" "${cache}/super mario bros.7z" add_launcher "c:\Program Files\Super Mario Bros\Mario.exe" diff --git a/.install/Swamp.sh b/.install/Swamp.sh index ca5e96c..4c43942 100644 --- a/.install/Swamp.sh +++ b/.install/Swamp.sh @@ -8,7 +8,7 @@ agm_yesno "Swamp Installation" "Swamp Installation" "If you do not have a full 3 deleteMusic=$? download "https://www.kaldobsky.com/audiogames/Swamp.zip" install_wine_bottle dx8vb quartz corefonts vb6run speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/Swamp.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/Swamp.zip" # make sure the latest version is installed. if curl -L --output "${cache}/SwampPatch.zip" "https://www.kaldobsky.com/audiogames/SwampPatch.zip" ; then unzip -o -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/SwampPatch.zip" diff --git a/.install/Tactical Battle.sh b/.install/Tactical Battle.sh index 14290ba..53fb68c 100644 --- a/.install/Tactical Battle.sh +++ b/.install/Tactical Battle.sh @@ -2,5 +2,5 @@ download "https://blindgamers.com/downloads/Tactical%20Battle%20Dev.zip" install_wine_bottle speechsdk LC_ALL=C DISPLAY="" winetricks -q dotnet462 ${wine}server -k -unzip -d "$WINEPREFIX/drive_c/Program Files/Tactical Battle" "${cache}/Tactical Battle Dev.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/Tactical Battle" "${cache}/Tactical Battle Dev.zip" add_launcher "c:\Program Files\Tactical Battle\Tactical Battle.exe" diff --git a/.install/Tarot Assistant.sh b/.install/Tarot Assistant.sh index 12637f7..e19a5f4 100644 --- a/.install/Tarot Assistant.sh +++ b/.install/Tarot Assistant.sh @@ -2,6 +2,6 @@ export winVer="win7" download "https://www.kaldobsky.com/audiogames/tarot.zip" install_wine_bottle vb6run dx8vb speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/Tarot Assistant" "${cache}/tarot.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/Tarot Assistant" "${cache}/tarot.zip" wine "c:\Program Files\Tarot Assistant\Checkup.exe" /verysilent add_launcher "c:\Program Files\Tarot Assistant\TarotAssistant.exe" diff --git a/.install/Technoshock.sh b/.install/Technoshock.sh index 0b239c3..f9fcfe7 100644 --- a/.install/Technoshock.sh +++ b/.install/Technoshock.sh @@ -1,7 +1,7 @@ download "http://tiflocomp.ru/download/games/technoshock_140b_en.zip" "http://tiflocomp.ru/download/games/technoshock140b_en_update.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/technoshock_140b_en.zip" -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/technoshock_140b_en_update.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/technoshock_140b_en.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/technoshock_140b_en_update.zip" wine "$WINEPREFIX/drive_c/Program Files/setup_eng.exe" /silent ${wine}server -w wine "$WINEPREFIX/drive_c/Program Files/setup_eng_update_pack.exe" /silent diff --git a/.install/The Blind Swordsman.sh b/.install/The Blind Swordsman.sh index a6fc2bc..bb9d720 100644 --- a/.install/The Blind Swordsman.sh +++ b/.install/The Blind Swordsman.sh @@ -1,4 +1,4 @@ download "https://www.agarchive.net/games/other/the%20blind%20swordsmanPC.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/the blind swordsmanPC.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/the blind swordsmanPC.zip" add_launcher "c:\Program Files\TheBlindSwordsman.exe" diff --git a/.install/The Great Toy Robbery.sh b/.install/The Great Toy Robbery.sh index d8b56f2..1aa381e 100644 --- a/.install/The Great Toy Robbery.sh +++ b/.install/The Great Toy Robbery.sh @@ -1,7 +1,5 @@ # Uses standard wine path based on architecture (win32/win64) export winVer="win7" -download "http://files.l-works.net/tgtrsetup_2.04.exe" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" install_wine_bottle dsound directmusic wine "${cache}/tgtrsetup_2.04.exe" /silent -find "${WINEPREFIX}/drive_c/Program Files/Lworks/The Great Toy Robbery" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \; add_launcher "c:\Program Files\Lworks\The Great Toy Robbery\tgtr.exe" diff --git a/.install/The Vale.sh b/.install/The Vale.sh index 212707c..039379a 100644 --- a/.install/The Vale.sh +++ b/.install/The Vale.sh @@ -2,7 +2,7 @@ get_installer "the-vale-win.zip" "https://falling-squirrel.itch.io/the-vale" export WINEARCH=win64 export winVer="win8" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/the-vale" "${cache}/the-vale-win.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/the-vale" "${cache}/the-vale-win.zip" # Weird work around to get keyboard working. winetricks -q usetakefocus=y winetricks -q usetakefocus=n diff --git a/.install/They'll Come from the Moon.sh b/.install/They'll Come from the Moon.sh index c339615..1fc466d 100644 --- a/.install/They'll Come from the Moon.sh +++ b/.install/They'll Come from the Moon.sh @@ -1,13 +1,11 @@ get_installer "theyll-come-from-the-moon-windows.zip" "https://soundrascal.itch.io/theyll-come-from-the-moon" -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" export WINEARCH=win64 export winVer="win8" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/tcftm" "${cache}/theyll-come-from-the-moon-windows.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/tcftm" "${cache}/theyll-come-from-the-moon-windows.zip" # Weird work around to get keyboard working. winetricks -q usetakefocus=y winetricks -q usetakefocus=n -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; add_launcher "c:\Program Files\tcftm\They'll Come from the Moon!.exe" echo "When the game launches, press the enter key to load the game which will begin to speak." alert diff --git a/.install/Thief.sh b/.install/Thief.sh index 1ced42a..c85bec1 100644 --- a/.install/Thief.sh +++ b/.install/Thief.sh @@ -2,5 +2,5 @@ export winVer="win7" download "http://oriolgomez.com/games/thief_en.zip" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/thief" "${cache}/thief_en.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/thief" "${cache}/thief_en.zip" add_launcher "c:\Program Files\thief\game.exe" diff --git a/.install/Three D velocity.sh b/.install/Three D velocity.sh index 6a33f34..ba493e7 100644 --- a/.install/Three D velocity.sh +++ b/.install/Three D velocity.sh @@ -1,12 +1,9 @@ export winVer="win10" export WINEARCH=win64 export norh=false # Must install a voice, and rhvoice works easily with 64 bit. -download "https://github.com/munawarb/Three-D-Velocity-Binaries/archive/master.zip" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" install_wine_bottle sapi vcrun2008 gdiplus xact dotnet48 xna40 # Dotnet is evil. That is all. # LC_ALL=C winetricks -q dotnet48 # ${wine}server -k # Ha ha ha. -unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/master.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \; -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/master.zip" add_launcher "c:\Program Files\Three-D-Velocity-Binaries-master\tdv.exe" diff --git a/.install/Tomb Hunter.sh b/.install/Tomb Hunter.sh index f36e363..4826c5d 100644 --- a/.install/Tomb Hunter.sh +++ b/.install/Tomb Hunter.sh @@ -1,5 +1,4 @@ download "http://masonasons.me/softs/th_freeware_password_is_tombhunter.7z" install_wine_bottle speechsdk -7z x -o"$WINEPREFIX/drive_c/Program Files/Tomb Hunter" "${cache}/th_freeware_password_is_tombhunter.7z" -ptombhunter -find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/Tomb Hunter" "${cache}/th_freeware_password_is_tombhunter.7z" -ptombhunter add_launcher "c:\Program Files\Tomb Hunter\th.exe" diff --git a/.install/Toy Mania.sh b/.install/Toy Mania.sh index 98cf068..623d1b9 100644 --- a/.install/Toy Mania.sh +++ b/.install/Toy Mania.sh @@ -2,6 +2,5 @@ export WINEARCH=win64 export winVer="win7" get_installer "ToyMania_windows_portable_password_is_GrateCollector.7z" "https://tsatria03.itch.io/toymania" install_wine_bottle -7z x -o"$WINEPREFIX/drive_c/Program Files/ToyMania" "${cache}/ToyMania_windows_portable_password_is_GrateCollector.7z" -pGrateCollector -find "${WINEPREFIX}/drive_c/Program Files/ToyMania" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/ToyMania" "${cache}/ToyMania_windows_portable_password_is_GrateCollector.7z" -pGrateCollector add_launcher "c:\Program Files\ToyMania\tm.exe" diff --git a/.install/Triple Triad.sh b/.install/Triple Triad.sh index d0658ab..9fc3a6a 100644 --- a/.install/Triple Triad.sh +++ b/.install/Triple Triad.sh @@ -2,6 +2,6 @@ export winVer="win7" download "https://www.kaldobsky.com/audiogames/tripletriad.zip" install_wine_bottle vb6run dx8vb speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/Triple Triad" "${cache}/tripletriad.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/Triple Triad" "${cache}/tripletriad.zip" wine "c:\Program Files\Triple Triad\Checkup.exe" /verysilent add_launcher "c:\Program Files\Triple Triad\TripleTriad.exe" diff --git a/.install/Troopanum2.sh b/.install/Troopanum2.sh index 07db0e3..262dce8 100644 --- a/.install/Troopanum2.sh +++ b/.install/Troopanum2.sh @@ -7,7 +7,7 @@ wine "${cache}/Troopanum2Setup.exe" /silent & xdotool sleep 10 key --clearmodifiers alt+y 2> /dev/null sleep 30 && ${wine}server -k # Sometimes the installer finishes but the ${wine}server has more processes that don't exit, so we can't depend on ${wine}server -w. mkdir -p "$WINEPREFIX/drive_c/Program Files/bsc-key-generator" -7z x -o"$WINEPREFIX/drive_c/Program Files/bsc-key-generator" "${cache}/BSC unlock code generator.7z" +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files/bsc-key-generator" "${cache}/BSC unlock code generator.7z" echo "$USER"$'\n'"$(hostname)"$'\n'"none"$'\n'"US" > "$WINEPREFIX/drive_c/Program Files/Troopanum 2.0/config.dat" unix2dos "$WINEPREFIX/drive_c/Program Files/Troopanum 2.0/config.dat" if command -v xclip &> /dev/null && command -v xdotool &> /dev/null ; then diff --git a/.install/Undead Assault.sh b/.install/Undead Assault.sh index f479af0..3025d50 100644 --- a/.install/Undead Assault.sh +++ b/.install/Undead Assault.sh @@ -1,6 +1,5 @@ export winVer="win7" download "http://undead-assault.com/static/files/public/undead_assault.zip" "${nvdaControllerClientDll}" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/undead_assault" "${cache}/undead_assault.zip" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/undead_assault" "${cache}/undead_assault.zip" add_launcher "c:\Program Files\undead_assault\Undead Assault.exe" diff --git a/.install/VIP Mud.sh b/.install/VIP Mud.sh index 380a7a0..27385c9 100644 --- a/.install/VIP Mud.sh +++ b/.install/VIP Mud.sh @@ -1,10 +1,7 @@ -download "http://gmagames.com/vipmud20016.exe" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" export winVer="win7" install_wine_bottle vb6run dx8vb speechsdk wine "${cache}/vipmud20016.exe" /silent mkdir -p "${HOME}/.local/wine/vip-mud/drive_c/users/${USER}/Documents/VIP Mud" -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \; -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \; add_launcher "c:\Program Files\VIPMud 2.0\vipmud2.exe" echo echo "When you first launch VIP Mud You will be presented with several inaccessible dialogs." diff --git a/.install/Villains From Beyond.sh b/.install/Villains From Beyond.sh index ebe6043..2cdc4c7 100644 --- a/.install/Villains From Beyond.sh +++ b/.install/Villains From Beyond.sh @@ -2,6 +2,5 @@ export winVer="win7" download "${ipfsGateway}/ipfs/QmWx271xuk3Mv9XTBoVu5BDJvXFZdasawC2nhtV21WAaUU?filename=villains_en.zip" install_wine_bottle speechsdk -unzip -d "$WINEPREFIX/drive_c/Program Files/villains from beyond" "${cache}/villains_en.zip" -find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/villains from beyond" "${cache}/villains_en.zip" add_launcher "c:\Program Files\villains from beyond\game.exe" diff --git a/.install/Warsim.sh b/.install/Warsim.sh index 2fd7957..26cd8ba 100644 --- a/.install/Warsim.sh +++ b/.install/Warsim.sh @@ -2,5 +2,5 @@ get_installer "Warsim Full Game.zip" "https://huw2k8.itch.io/warsim" export WINEARCH=win64 export winVer="win7" install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/Warsim/" "${cache}/Warsim Full Game.zip" +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/Warsim/" "${cache}/Warsim Full Game.zip" add_launcher "c:\Program Files\Warsim\Warsim.exe" diff --git a/.install/Wave of the Undead.sh b/.install/Wave of the Undead.sh index cedfc3b..d31b696 100644 --- a/.install/Wave of the Undead.sh +++ b/.install/Wave of the Undead.sh @@ -1,6 +1,5 @@ export WINEARCH=win64 export winVer="win7" -download "https://dl.dropbox.com/scl/fi/ukvou0y4gwg21nhhdpj40/Wave-of-the-Undead-Setup.exe?rlkey=4xnuwicpmbkx6w2jo2i56mijg" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" install_wine_bottle wine "${cache}/Wave-of-the-Undead-Setup.exe" & xdotool sleep 20 key Alt+n sleep 2 key Alt+n sleep 2 key Alt+n @@ -9,5 +8,4 @@ wine "${cache}/Wave-of-the-Undead-Setup.exe" & xdotool sleep 2 key space xdotool sleep 2 key Alt+f ${wine}server -w -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; add_launcher "c:\Program Files (x86)\Wave Of The Undead\wave_of_the_undead.exe" diff --git a/.install/World of War.sh b/.install/World of War.sh index 45d1fe5..0004f6b 100644 --- a/.install/World of War.sh +++ b/.install/World of War.sh @@ -2,5 +2,5 @@ export winVer="win7" download "https://www.agarchive.net/games/nyanchan/world%20of%20war%20English.7z" install_wine_bottle -7z x -o"$WINEPREFIX/drive_c/nyanchangame" "${cache}/world of war English.7z" +install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/nyanchangame" "${cache}/world of war English.7z" add_launcher "c:\nyanchangame\world of war English\world of war.exe" diff --git a/.install/haunted Party.sh b/.install/haunted Party.sh index e0fd811..e5c08ca 100644 --- a/.install/haunted Party.sh +++ b/.install/haunted Party.sh @@ -1,9 +1,7 @@ get_installer "hp.zip" "https://tunmi13.itch.io/haunted-party" -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" export WINEARCH=win64 export winVer="win8" # Uses standard wine path based on architecture (win32/win64) install_wine_bottle -unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/hp.zip" -find "${WINEPREFIX}/drive_c/Program Files/hp" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/hp.zip" add_launcher "c:\Program Files\hp\hp.exe" diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 77d7775..6929297 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -33,7 +33,7 @@ game_installer() { done # If all games are installed, exit if [[ ${#menuList[@]} -eq 0 ]]; then - echo "All games are already installed." + agm_msgbox "Audio Game Installer" "" "All games are already installed." exit 0 fi menuList+=("Donate" "Donate") @@ -74,7 +74,7 @@ game_removal() { # Modern wine is unified - no architecture-specific wine executables needed mapfile -t lines < <(sed -e '/^$/d' -e '/^[[:space:]]*#/d' "${configFile}" 2> /dev/null) if [[ ${#lines} -eq 0 ]]; then - echo "No games found." + agm_msgbox "Audio Game Removal" "" "No games found." exit 0 fi # Create the menu of installed games @@ -112,7 +112,7 @@ game_removal() { get_bottle "${game[0]}" if ! agm_yesno "Confirm Removal" "Audio Game Removal" "Are you sure you want to remove \"${game[2]}\"?"; then - echo "Removal cancelled." + agm_msgbox "Audio Game Removal" "" "Removal cancelled." exit 0 fi @@ -142,7 +142,7 @@ kill_game() { # Modern wine is unified - no architecture-specific wine executables needed mapfile -t lines < <(sed '/^$/d' "${configFile}" 2> /dev/null) if [[ ${#lines} -eq 0 ]]; then - echo "No games found." + agm_msgbox "Audio Game Killer" "" "No games found." exit 0 fi # Create the menu of installed games @@ -171,7 +171,7 @@ kill_game() { # kill the wine server. get_bottle "${game%|*}" wineserver -k - echo "The selected game has been stopped." + agm_msgbox "Audio Game Killer" "" "The selected game has been stopped." fi exit 0 } @@ -338,7 +338,7 @@ game_launcher() { update_nvda_dlls mapfile -t lines < <(sed -e '/^$/d' -e '/^ *#/d' "${configFile}" 2> /dev/null) if [[ ${#lines} -eq 0 ]]; then - echo "Install some games first." + agm_msgbox "Audio Game Launcher" "" "Install some games first." exit 0 fi if [[ $# -eq 0 ]]; then @@ -369,7 +369,7 @@ game_launcher() { else create_game_array "$game" if [[ -z "$game" ]]; then - echo "Game $1 not found." + agm_msgbox "Audio Game Launcher" "" "Game $1 not found." exit 1 fi fi @@ -558,6 +558,6 @@ if [[ -f ".install/${game}.sh" ]]; then export LANG="en_US.UTF-8" . ".install/${game}.sh" else - echo "Error: Game '${game}' not found in .install directory" + agm_msgbox "Audio Game Installer" "" "Error: Game '${game}' not found in .install directory" exit 1 fi