diff --git a/.includes/functions.sh b/.includes/functions.sh index fcfa3e7..8db8e0d 100644 --- a/.includes/functions.sh +++ b/.includes/functions.sh @@ -194,13 +194,16 @@ install_with_progress() { case "$operation" in "unzip") - unzip "$@" | agm_progressbox "Game Installation" "$message" + # Always overwrite without prompting to prevent invisible terminal prompts + unzip -o "$@" | agm_progressbox "Game Installation" "$message" ;; "7z") - 7z "$@" | agm_progressbox "Game Installation" "$message" + # Always overwrite without prompting for 7z as well + 7z -y "$@" | agm_progressbox "Game Installation" "$message" ;; "cp"|"copy") - cp -v "$@" | agm_progressbox "Game Installation" "$message" + # Always force overwrite to prevent invisible prompts in GUI mode + cp -fv "$@" | agm_progressbox "Game Installation" "$message" ;; "find") find "$@" | agm_progressbox "Game Installation" "$message" diff --git a/.install/Alien Outback.sh b/.install/Alien Outback.sh index 70e0b6f..44e0691 100644 --- a/.install/Alien Outback.sh +++ b/.install/Alien Outback.sh @@ -2,7 +2,7 @@ download "http://download.dracoent.com/Windows/classic/AOSetup.exe" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle vb6run dx8vb speechsdk quartz -cp -v "${cache}/AOSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" +cp -fv "${cache}/AOSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" wine "c:/windows/temp/AOSetup.exe" /sp- /silent rm -fv "$WINEPREFIX/drive_c/windows/temp/AOSetup.exe" # warning warning warning: Do not change location, or installer will not function. diff --git a/.install/Balatro.sh b/.install/Balatro.sh index e855bba..3318572 100644 --- a/.install/Balatro.sh +++ b/.install/Balatro.sh @@ -8,8 +8,8 @@ pushd "$WINEPREFIX/drive_c/users/$USER/AppData/Roaming/Balatro/Mods" (cat mod_urls.txt ; echo) | while read -r x ; do git clone "$x" 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 ../version.dll "$WINEPREFIX/drive_c/Program Files/Balatro" +cp -fv BlackHole/bin/*.dll "$WINEPREFIX/drive_c/Program Files/Balatro" +cp -fv "$cache/Tolk.dll" "$WINEPREFIX/drive_c/Program Files/Balatro/tolk.dll" +cp -fv "$cache/Tolk.dll" BlackHole/bin/tolk.dll +cp -fv ../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/Bokurano Daibouken 3.sh b/.install/Bokurano Daibouken 3.sh index 68c68c4..cb5edec 100644 --- a/.install/Bokurano Daibouken 3.sh +++ b/.install/Bokurano Daibouken 3.sh @@ -12,7 +12,7 @@ for i in "${HOME}/Downloads/dict.dat" "${HOME}/Desktop/dict.dat" ; do fi 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" + agm_yesno "Bokurano Daibouken 3" "Bokurano Daibouken 3" "Possible English translation file found at $dictFile. Would you like to use it for BK3?" && cp -fv "$dictFile" "${cache}/bk3-dict.dat" fi download "https://www.nyanchangames.com/softs/nn3_setup.exe" # Uses standard wine path based on architecture (win32/win64) diff --git a/.install/Change Reaction.sh b/.install/Change Reaction.sh index 5ae499e..77d9339 100644 --- a/.install/Change Reaction.sh +++ b/.install/Change Reaction.sh @@ -2,7 +2,7 @@ download "https://download.dracoent.com/Windows/ChangeReactionSetup.exe" # Uses standard wine path based on architecture (win32/win64) export winVer="win7" install_wine_bottle vb6run dx8vb speechsdk quartz -cp -v "${cache}/ChangeReactionSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" +cp -fv "${cache}/ChangeReactionSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" wine "c:/windows/temp/ChangeReactionSetup.exe" /sp- /silent rm -fv "$WINEPREFIX/drive_c/windows/temp/ChangeReactionSetup.exe" # warning warning warning: Do not change location, or installer will not function. diff --git a/.install/Christmas Chaos.sh b/.install/Christmas Chaos.sh index d68c994..e6005a7 100644 --- a/.install/Christmas Chaos.sh +++ b/.install/Christmas Chaos.sh @@ -3,5 +3,5 @@ export winVer="win7" download "${ipfsGateway}/ipfs/QmYx11vsMDBgjPd1coZPGHxMXf2qtf4icqmB3Q9iUazyQv?filename=ChristmasChaos.zip" "https://stormgames.wolfe.casa/downloads/Tolk.dll" install_wine_bottle 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" "{}" \; +find "${WINEPREFIX}" -type f -name 'Tolk.dll' -exec cp -fv "${cache}/Tolk.dll" "{}" \; add_launcher "c:\Program Files\ChristmasChaos\ChristmasChaos.exe" diff --git a/.install/Crazy Party.sh b/.install/Crazy Party.sh index 94ab870..156f6a6 100644 --- a/.install/Crazy Party.sh +++ b/.install/Crazy Party.sh @@ -3,5 +3,5 @@ export WINEARCH=win64 export winVer="win8" install_wine_bottle 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 'Tolk.dll' -exec cp -fv "${cache}/Tolk.dll" "{}" \; add_launcher "c:\Program Files\Crazy-Party-beta82\Crazy Party.exe" diff --git a/.install/DynaMan.sh b/.install/DynaMan.sh index ef6e1df..99c588c 100644 --- a/.install/DynaMan.sh +++ b/.install/DynaMan.sh @@ -2,7 +2,7 @@ export winVer="win7" # Uses standard wine path based on architecture (win32/win64) download "http://download.dracoent.com/Windows/classic/DMSetup.exe" install_wine_bottle vb6run dx8vb speechsdk quartz -cp -v "${cache}/DMSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" +cp -fv "${cache}/DMSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" wine "c:/windows/temp/DMSetup.exe" /sp- /silent rm -fv "$WINEPREFIX/drive_c/windows/temp/DMSetup.exe" # warning warning warning: Do not change location, or installer will not function. diff --git a/.install/ESP Pinball Classic.sh b/.install/ESP Pinball Classic.sh index 5c4f4bb..cde9d11 100644 --- a/.install/ESP Pinball Classic.sh +++ b/.install/ESP Pinball Classic.sh @@ -2,7 +2,7 @@ export winVer="win7" # Uses standard wine path based on architecture (win32/win64) download "http://download.dracoent.com/Windows/classic/PBCSetup.exe" install_wine_bottle vb6run dx8vb speechsdk quartz -cp -v "${cache}/PBCSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" +cp -fv "${cache}/PBCSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" wine "c:/windows/temp/PBCSetup.exe" /sp- /silent rm -fv "$WINEPREFIX/drive_c/windows/temp/PBCSetup.exe" # warning warning warning: Do not change location, or installer will not function. diff --git a/.install/ESP Pinball Extreme.sh b/.install/ESP Pinball Extreme.sh index 8e290c7..9366a0b 100644 --- a/.install/ESP Pinball Extreme.sh +++ b/.install/ESP Pinball Extreme.sh @@ -2,7 +2,7 @@ export winVer="win7" # Uses standard wine path based on architecture (win32/win64) download "http://download.dracoent.com/Windows/classic/PBXSetup.exe" install_wine_bottle vb6run dx8vb speechsdk quartz -cp -v "${cache}/PBXSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" +cp -fv "${cache}/PBXSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" wine "c:/windows/temp/PBXSetup.exe" /sp- /silent rm -fv "$WINEPREFIX/drive_c/windows/temp/PBXSetup.exe" # warning warning warning: Do not change location, or installer will not function. diff --git a/.install/ESP Pinball Party Pack.sh b/.install/ESP Pinball Party Pack.sh index 109ba61..a758cc6 100644 --- a/.install/ESP Pinball Party Pack.sh +++ b/.install/ESP Pinball Party Pack.sh @@ -7,7 +7,7 @@ if ! [ -f "$HOME/.local/wine/$bottle/drive_c/Program Files/Draconis Entertainmen exit 1 fi download "http://download.dracoent.com/Windows/classic/PP1Setup.exe" -cp -v "${cache}/PP1Setup.exe" "$WINEPREFIX/drive_c/windows/temp/" +cp -fv "${cache}/PP1Setup.exe" "$WINEPREFIX/drive_c/windows/temp/" wine "c:/windows/temp/PP1Setup.exe" /sp- /silent rm -fv "$WINEPREFIX/drive_c/windows/temp/PP1Setup.exe" add_launcher "c:\Program Files\Draconis Entertainment\ESP Pinball Xtreme\pbx.exe" diff --git a/.install/Eurofly.sh b/.install/Eurofly.sh index 6073dcf..418328c 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 -install_with_progress unzip "Extracting game files..." -o -d "$WINEPREFIX/drive_c/Eurofly" "${cache}/Launcher_1.2.zip" +install_with_progress unzip "Extracting game files..." -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/Laser Breakout.sh b/.install/Laser Breakout.sh index 0df9c46..ea843cc 100644 --- a/.install/Laser Breakout.sh +++ b/.install/Laser Breakout.sh @@ -4,5 +4,5 @@ export winVer="win7" download "https://www.agarchive.net/games/nyanchan/laser%20breakout.7z" "https://stormgames.wolfe.casa/downloads/laser-breakout-options.dat" install_wine_bottle 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" +cp -fv "$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/Monkey Business.sh b/.install/Monkey Business.sh index bba69b6..0cbfa9a 100644 --- a/.install/Monkey Business.sh +++ b/.install/Monkey Business.sh @@ -2,7 +2,7 @@ export winVer="win7" # Uses standard wine path based on architecture (win32/win64) download "http://download.dracoent.com/Windows/classic/MBSetup.exe" install_wine_bottle vb6run dx8vb speechsdk quartz -cp -v "${cache}/MBSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" +cp -fv "${cache}/MBSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" wine "c:/windows/temp/MBSetup.exe" /sp- /silent rm -fv "$WINEPREFIX/drive_c/windows/temp/MBSetup.exe" # warning warning warning: Do not change location, or installer will not function. diff --git a/.install/Scrolling Battles.sh b/.install/Scrolling Battles.sh index 85a1ab4..fcc5ebb 100644 --- a/.install/Scrolling Battles.sh +++ b/.install/Scrolling Battles.sh @@ -4,5 +4,5 @@ get_installer "sbrw-win.zip" "https://masonasons.itch.io/sbrw" download "https://stormgames.wolfe.casa/downloads/Tolk.dll" install_wine_bottle 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" "{}" \; +find "${WINEPREFIX}" -type f -name 'Tolk.dll' -exec cp -fv "${cache}/Tolk.dll" "{}" \; add_launcher "c:\Program Files\sbrw\sb.exe" diff --git a/.install/Side Party.sh b/.install/Side Party.sh index 7c861e9..a517d72 100644 --- a/.install/Side Party.sh +++ b/.install/Side Party.sh @@ -11,7 +11,7 @@ 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:" "")" mkdir -p "$WINEPREFIX/drive_c/Program Files/Side Party/masonasons.me/SideParty" -cp -v "${cache}/SidePartySettings.dat" "$WINEPREFIX/drive_c/Program Files/Side Party/masonasons.me/SideParty/settings.dat" +cp -fv "${cache}/SidePartySettings.dat" "$WINEPREFIX/drive_c/Program Files/Side Party/masonasons.me/SideParty/settings.dat" if [[ ${#sidePartyUser} -gt 3 ]]; then sed -i "s/Anonymous/${sidePartyUser}/" "$WINEPREFIX/drive_c/Program Files/Side Party/masonasons.me/SideParty/settings.dat" fi diff --git a/.install/Silver Dollar.sh b/.install/Silver Dollar.sh index e5e3ce2..2016dd0 100644 --- a/.install/Silver Dollar.sh +++ b/.install/Silver Dollar.sh @@ -2,7 +2,7 @@ export winVer="win7" # Uses standard wine path based on architecture (win32/win64) download "http://download.dracoent.com/Windows/SilverDollarSetup.exe" install_wine_bottle speechsdk -cp -v "${cache}/SilverDollarSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" +cp -fv "${cache}/SilverDollarSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" wine "c:/windows/temp/SilverDollarSetup.exe" /sp- /silent rm -fv "$WINEPREFIX/drive_c/windows/temp/SilverDollarSetup.exe" # warning warning warning: Do not change location, or installer will not function. diff --git a/.install/Swamp.sh b/.install/Swamp.sh index 4c43942..a6567d4 100644 --- a/.install/Swamp.sh +++ b/.install/Swamp.sh @@ -11,7 +11,7 @@ install_wine_bottle dx8vb quartz corefonts vb6run speechsdk 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_with_progress unzip "Installing Swamp patch..." -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/SwampPatch.zip" fi $wine 'c:\Program Files\swamp\checkup.exe' /verysilent #$wine cmd.exe /c 'cd /d c:\Program Files\swamp && Windows32bit.bat' diff --git a/.install/Ten Pin Alley.sh b/.install/Ten Pin Alley.sh index 799c19c..f61b46e 100644 --- a/.install/Ten Pin Alley.sh +++ b/.install/Ten Pin Alley.sh @@ -2,7 +2,7 @@ export winVer="win7" # Uses standard wine path based on architecture (win32/win64) download "http://download.dracoent.com/Windows/classic/TPAXPSetup.exe" install_wine_bottle vb6run dx8vb speechsdk quartz -cp -v "${cache}/TPAXPSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" +cp -fv "${cache}/TPAXPSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" wine "c:/windows/temp/TPAXPSetup.exe" /sp- /silent rm -fv "$WINEPREFIX/drive_c/windows/temp/TPAXPSetup.exe" #winetricks -q msdxmocx # I think having this installed first breaks things. diff --git a/.install/Ultimate SounDoku.sh b/.install/Ultimate SounDoku.sh index e69af1c..17d2165 100644 --- a/.install/Ultimate SounDoku.sh +++ b/.install/Ultimate SounDoku.sh @@ -2,7 +2,7 @@ export winVer="win7" # Uses standard wine path based on architecture (win32/win64) download "http://download.dracoent.com/Windows/classic/USSetup.exe" install_wine_bottle vb6run dx8vb speechsdk quartz -cp -v "${cache}/USSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" +cp -fv "${cache}/USSetup.exe" "$WINEPREFIX/drive_c/windows/temp/" wine "c:/windows/temp/USSetup.exe" /sp- /silent rm -fv "$WINEPREFIX/drive_c/windows/temp/USSetup.exe" # warning warning warning: Do not change location, or installer will not function.