Add progress bars to some more operations, e.g. installing games. This required a bulk edit to all installer scripts, thanks Claud for the assist. Oh and send downloads through a progressbar.

.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
+            DISPLAY="" wineboot -u | agm_progressbox "Wine Setup" "Initializing wine bottle..."
-            wine msiexec /i z:"$monoPath" /quiet
+            wine msiexec /i z:"$monoPath" /quiet | agm_progressbox "Wine Setup" "Installing .NET Framework..."
-            wine msiexec /i z:"$geckoPath" /quiet
+            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

.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
+       if ! curl -L4 -C - --retry 10 --output "${cache}/${dest}" "${i}" 2>&1 | agm_progressbox "Audio Game Manager" "Downloading \"$dest\"..."; then
-           echo "Could not download \"$i\"..."
+           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
+}

.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"
+install_with_progress unzip "Extracting game files..." -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" "{}" \;
 add_launcher "c:\Program Files\a-heros-call\A Hero's Call.exe"

.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"
+install_with_progress unzip "Extracting game files..." -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 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"

.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'

.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"

.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"
+install_with_progress unzip "Extracting game files..." -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/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."

.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'

.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"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/$game" "${cache}/bth.zip"
-find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
 add_launcher "c:\Program Files\\${game}\bth.exe"

.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"
+install_with_progress unzip "Extracting game files..." -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" "{}" \;
 add_launcher "c:\Program Files\bf\bf.exe"

.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"

.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"

.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"
+install_with_progress 7z "Extracting game files..." 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 "{}" \;
 add_launcher "c:\nyanchangame\bk2\play.exe"

.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"
+install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/nyanchangame/bk3" "${cache}/nn3_setup.exe"
-find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \;
 add_launcher "c:\nyanchangame\bk3\play.exe"

.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"
+install_with_progress 7z "Extracting game files..." 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 "{}" \;
 add_launcher "c:\nyanchangame\bk\play.exe"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/bomvercats" "${cache}/bombercats_en.zip"
-find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
 add_launcher "c:\Program Files\bomvercats\game.exe"

.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"

.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"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/breed_memorial.zip"
-#find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
 add_launcher "c:\Program Files\Breed memorial\Breed memorial\breed memorial.exe"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/breu2.zip"
-find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \;
 add_launcher "c:\Program Files\breu2\breu2.exe"

.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"

.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"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/$game" "${cache}/coth.zip"
-find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
 add_launcher "c:\Program Files\\${game}\game.exe"

.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"

.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"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files" "${cache}/clashes_of_the_sky.zip"
-find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
 add_launcher 'c:\Program Files\clashes_of_the_sky\clash.exe'

.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"

.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"

.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'

.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"
+install_with_progress unzip "Extracting game files..." -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" "{}" \;
 add_launcher 'c:\Program Files\ConstantMotion\cm.exe'

.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"

.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"

.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"
+install_with_progress unzip "Extracting game files..." -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" "{}" \;
 add_launcher "c:\Program Files\crime-hunter\ch.exe"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/danger on the wheel" "${cache}/wheel_en.zip"
-find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
 add_launcher "c:\Program Files\danger on the wheel\game.exe"

.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"

.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"

.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

.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"

.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
+install_with_progress 7z "Extracting game files..." x -y -o"$WINEPREFIX/drive_c/Program Files/Endless Runner" "${cache}/EndlessRunner.7z" -prunner
-find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
 add_launcher "c:\Program Files\Endless Runner\runner.exe"

.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

.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..."

.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"
+install_with_progress unzip "Extracting game files..." -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" "{}" \;
 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:"

.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"

.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"

.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."

.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

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/hammer of glory" "${cache}/hammer_en.zip"
-find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
 add_launcher "c:\Program Files\hammer of glory\game.exe"

.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

.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

.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"

.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"
+install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/nyanchangame/" "$cache/laser breakout.7z"
-find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \;
 cp -v "$cache/laser-breakout-options.dat" "$WINEPREFIX/drive_c/nyanchangame/laser breakout/options.dat"
 add_launcher "c:\nyanchangame\laser breakout\play.exe"

.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"
+install_with_progress 7z "Extracting game files..." 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" "{}" \;
 add_launcher "c:\Program Files\Light Battles\battles.exe"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/lost" "$cache/lost.zip"
-find "$WINEPREFIX/drive_c/Program Files/lost" -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
 add_launcher 'c:\Program Files\lost\lost.exe'

.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

.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"

.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

.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"
+install_with_progress unzip "Extracting game files..." -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" "{}" \;
 add_launcher "c:\Program Files\oh_shit\OhShit.exe"

.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"

.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"

.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"

.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

.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"

.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"

.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"

.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"

.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"

.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"
+install_with_progress unzip "Extracting game files..." -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" "{}" \;
 add_launcher "c:\Program Files\rhythm rage\game.exe"

.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"
+install_with_progress 7z "Extracting game files..." x -o"$WINEPREFIX/drive_c/Program Files" "${cache}/the road to rage offline.7z"
-find "${WINEPREFIX}" -type f -name "nvdaControllerClient.dll" -exec rm -fv "{}" \;
 add_launcher "c:\Program Files\RTR Offline\rtr.exe"

.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"

.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"

.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"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/scramble_win32.zip"
-find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \;
 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"

.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"

.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"

.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"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/shooter" "${cache}/shooter-win.zip"
-find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \;
 add_launcher "c:\Program Files\shooter\shooter.exe"

.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"
+install_with_progress unzip "Extracting game files..." -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" "{}" \;
 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:" "")"

.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"
+install_with_progress 7z "Extracting game files..." 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"
+install_with_progress 7z "Extracting game files..." 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" "{}" \;
 add_launcher "c:\Program Files\simple fighter\game.exe"

.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"
+install_with_progress unzip "Extracting Skateboarder Pro..." -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" "{}" \;
 add_launcher "c:\Program Files\sb_pro_rw\sb_pro.exe"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/sketchbook" "${cache}/SBYW.zip"
-unzip -d "$WINEPREFIX/drive_c/Program Files/sketchbook" "${cache}/SBYW-sounds.zip"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/sketchbook" "${cache}/SBYW-sounds.zip"
-find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
 add_launcher "c:\Program Files\sketchbook\SBYW.exe"

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/shooter" "${cache}/shooter-win.zip"
-find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \;
 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"
+install_with_progress unzip "Extracting game files..." -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" "{}" \;
 add_launcher "c:\Program Files\sb_pro_rw\sb_pro.exe"

.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'

.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"
+install_with_progress unzip "Extracting game files..." -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/space_defender.zip"
-find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvdaControllerClient64.dll" "{}" \;
 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"

.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"

.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

.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"

.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"

.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"

.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"

.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"
+install_with_progress unzip "Extracting game files..." -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_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

.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"

.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"

.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

.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

.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"

.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"
+install_with_progress unzip "Extracting game files..." -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" "{}" \;
 add_launcher "c:\Program Files\Three-D-Velocity-Binaries-master\tdv.exe"

.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
+install_with_progress 7z "Extracting game files..." 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 "{}" \;
 add_launcher "c:\Program Files\Tomb Hunter\th.exe"

.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
+install_with_progress 7z "Extracting game files..." 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" "{}" \;
 add_launcher "c:\Program Files\ToyMania\tm.exe"

.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"