From fbdae7409eba514a30e5ff0a6a717d77031b86e4 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sun, 22 Jan 2023 10:25:29 -0800
Subject: [PATCH] Fixed many problem uses for 7-zip's extract without
 directories flag. I'm honestly not sure why some of these games actually
 worked. Please be on the lookout for bugs.

---
 audiogame-manager.sh | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index 5da72a2..9cb2a6e 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -1174,7 +1174,7 @@ case "${game}" in
         install_wine_bottle speechsdk
         download "http://www.vgstorm.com/aac/aac.zip" "https://www.agarchive.net/games/vg/adventure%20at%20c%20stages.7z"
         unzip -d "$WINEPREFIX/drive_c/Program Files/aac" "${cache}/aac.zip"
-        7z e -o"$WINEPREFIX/drive_c/Program Files/aac/stages" "${cache}/adventure at c stages.7z"
+        7z x -o"$WINEPREFIX/drive_c/Program Files/aac/stages" "${cache}/adventure at c stages.7z"
         add_launcher "c:\Program Files\aac\aac.exe"
     ;;
     "Alien Outback")
@@ -1902,7 +1902,7 @@ case "${game}" in
     "Endless Runner")
         install_wine_bottle speechsdk
         download "http://www.masonasons.me/softs/EndlessRunner.7z"
-        7z e -y -o"$WINEPREFIX/drive_c/Program Files/Endless Runner" "${cache}/EndlessRunner.7z" -prunner
+        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 "{}" \;
         add_launcher "c:\Program Files\Endless Runner\runner.exe"
     ;;
@@ -1915,7 +1915,7 @@ case "${game}" in
         download "http://blind-games.com/newentombed/EntombedSetup.exe" "https://download.microsoft.com/download/E/C/1/EC1B2340-67A0-4B87-85F0-74D987A27160/SSCERuntime-ENU.exe" "https://stormgames.wolfe.casa/downloads/Entombed.exe.config" "https://stormgames.wolfe.casa/downloads/mfplat.dll"
         mkdir -p "${WINEPREFIX}/drive_c/temp"
         pushd "${WINEPREFIX}/drive_c/temp"
-        7z e "${cache}/SSCERuntime-ENU.exe"
+        7z x "${cache}/SSCERuntime-ENU.exe"
         wine msiexec /i "${WINEPREFIX}/drive_c/temp/SSCERuntime_x86-ENU.msi" /q
         rm *
         popd
@@ -2075,7 +2075,7 @@ case "${game}" in
         xdotool sleep 10 key --clearmodifiers alt+y 2> /dev/null
         sleep 30 && wineserver -k # Sometimes the installer finishes but the wineserver has more processes that don't exit, so we can't depend on wineserver -w.
         mkdir -p "$WINEPREFIX/drive_c/Program Files/bsc-key-generator"
-        7z e -o"$WINEPREFIX/drive_c/Program Files/bsc-key-generator" "${cache}/BSC unlock code generator.7z"
+        7z 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"
         command -v unix2dos &> /dev/null && unix2dos "$WINEPREFIX/drive_c/Program Files/Hunter/config.dat" || echo "Warning! You do not have unix2dos or dos2unix installed, Hunter may not work!"
         if command -v xclip &> /dev/null && command -v xdotool &> /dev/null ; then
@@ -2155,7 +2155,7 @@ EOF
         export winVer="win7"
         install_wine_bottle
         download "https://www.agarchive.net/games/nyanchan/laser%20breakout.7z" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll"
-        7z e -o"$WINEPREFIX/drive_c/nyanchangame/laser breakout" "$cache/laser breakout.7z"
+        7z x -o"$WINEPREFIX/drive_c/nyanchangame/laser breakout" "$cache/laser breakout.7z"
         find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \;
         add_launcher "c:\nyanchangame\laser breakout\play.exe"
     ;;
@@ -2163,7 +2163,7 @@ EOF
         export winVer="win7"
         install_wine_bottle speechsdk
         download "https://prometheus-enterprises.com/games/CoL.exe"
-        7z e -o"$WINEPREFIX/drive_c/Program Files/Light Battles" "${cache}/CoL.exe"
+        7z x -o"$WINEPREFIX/drive_c/Program Files/Light Battles" "${cache}/CoL.exe"
         rm -fv "${WINEPREFIX}/drive_c/Program Files/Light Battles/nvdaControllerClient.dll"
         add_launcher "c:\Program Files\Light Battles\battles.exe"
     ;;
@@ -2561,10 +2561,7 @@ EOF
         export winVer="win7"
         install_wine_bottle speechsdk
         download "https://www.agarchive.net/games/jeqoconGames/sonic%20the%20hedgehog.7z"
-        7z e -o"$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog" "${cache}/sonic the hedgehog.7z"
-        cp -v "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.wav "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.ogg "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.mp3 "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/sfx/
-        cp -v "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.wav "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.ogg "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.mp3 "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/music/
-        cp -v "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.wav "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.ogg "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.mp3 "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/angles/
+        7z 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"
     ;;
    "Sonic Zoom")
@@ -2607,8 +2604,7 @@ EOF
         export winVer="win7"
         install_wine_bottle speechsdk
         download "https://www.agarchive.net/games/jeqoconGames/super%20mario%20bros.7z"
-        7z e -o"$WINEPREFIX/drive_c/Program Files/Super Mario Bros" "${cache}/super mario bros.7z"
-        cp -v "$WINEPREFIX/drive_c/Program Files/Super Mario Bros"/*.wav "$WINEPREFIX/drive_c/Program Files/Super Mario Bros"/*.ogg "$WINEPREFIX/drive_c/Program Files/Super Mario Bros"/mario/
+        7z 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"
     ;;
     "Survive the Wild")
@@ -2712,7 +2708,7 @@ EOF
     "Tomb Hunter")
         install_wine_bottle speechsdk
         download "http://masonasons.me/softs/th_freeware_password_is_tombhunter.7z"
-        7z e -o"$WINEPREFIX/drive_c/Program Files/Tomb Hunter" "${cache}/th_freeware_password_is_tombhunter.7z" -ptombhunter
+        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 "{}" \;
         add_launcher "c:\Program Files\Tomb Hunter\th.exe"
     ;;
@@ -2761,7 +2757,7 @@ export norh=false # Must install a voice, and rhvoice works easily with 64 bit.
         xdotool sleep 10 key --clearmodifiers alt+y 2> /dev/null
         sleep 30 && wineserver -k # Sometimes the installer finishes but the wineserver has more processes that don't exit, so we can't depend on wineserver -w.
         mkdir -p "$WINEPREFIX/drive_c/Program Files/bsc-key-generator"
-        7z e -o"$WINEPREFIX/drive_c/Program Files/bsc-key-generator" "${cache}/BSC unlock code generator.7z"
+        7z 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"
         command -v unix2dos &> /dev/null && unix2dos "$WINEPREFIX/drive_c/Program Files/Troopanum 2.0/config.dat" || echo "Warning! You do not have unix2dos or dos2unix installed, Troopanum 2.0 may not work!"
         if command -v xclip &> /dev/null && command -v xdotool &> /dev/null ; then