From 19f52197580967f2cd9fae62afcd490bbaa7a824 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Thu, 17 Dec 2020 12:36:26 -0500 Subject: [PATCH 1/5] I was able to remove several xdotool calls. this should make several more games install on Mac without user intervention. --- audiogame-manager.sh | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 06083e1..4fde6f5 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash license() { cat << EOF @@ -617,9 +617,7 @@ case "${game}" in "Christmas WhoopAss") install_wine_bottle vb6run dx8vb download "https://www.agarchive.net/games/draconis/christmas%20whoopass%20setup.exe" - wine "${cache}/christmas whoopass setup.exe" /silent & - xdotool sleep 10 key --clearmodifiers alt+y 2> /dev/null - wineserver -w + wine "${cache}/christmas whoopass setup.exe" /sp- /silent add_launcher "c:\Program Files\Draconis Entertainment\Christmas Whoop Ass\wa.exe" ;; "Crazy Party") @@ -633,9 +631,7 @@ case "${game}" in "Crazy Tennis") install_wine_bottle speechsdk download "https://www.agarchive.net/games/VIP/crazy%20tennis%20setup.exe" - wine "${cache}/crazy tennis setup.exe" /silent & - xdotool sleep 10 key --clearmodifiers alt+y 2> /dev/null - wineserver -w + wine "${cache}/crazy tennis setup.exe" /sp- /silent add_launcher "c:\Program Files\Crazytennis\crazytennis.exe" ;; "Death on the Road") @@ -670,14 +666,12 @@ case "${game}" in install_wine_bottle dx8vb vb6run download "http://www.agarchive.net/games/bpc/fartman.exe" wine "${cache}/fartman.exe" /silent - #add_launcher "c:\Program Files\Finger Panic 1.0\FingerPanic.exe" + #add_launcher "c:\Program Files\" ;; "Finger Panic") install_wine_bottle dx8vb vb6run download "http://www.agarchive.net/games/bsc/FingerPanicSetup.exe" - wine "${cache}/FingerPanicSetup.exe" /silent & - xdotool sleep 10 key --clearmodifiers alt+y 2> /dev/null - wineserver -w + wine "${cache}/FingerPanicSetup.exe" /sp- /silent add_launcher "c:\Program Files\Finger Panic 1.0\FingerPanic.exe" ;; "Fuck That Bird") @@ -869,9 +863,7 @@ EOF "Pacman Talks") install_wine_bottle download "http://www.gmagames.com/pmt101.exe" - wine "${cache}/pmt101.exe" /silent & - xdotool sleep 10 key --clearmodifiers alt+y 2> /dev/null - wineserver -w + wine "${cache}/pmt101.exe" /sp- /silent & add_launcher "c:\Program Files\Pacman Talks\pmt.exe" ;; "Palace Punch Up") From ae8dc85de17afcfbf705243f6229c3299e92603f Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Fri, 18 Dec 2020 10:36:21 -0500 Subject: [PATCH 2/5] Added Castaways 2, try to stop source from offering binary update on Mac. --- audiogame-manager.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 4fde6f5..a30c132 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -49,7 +49,7 @@ export DIALOGOPTS='--no-lines --visit-items' # Automatic update function update() { local filePath="$(command -v ${0})" - if file "${filePath}" | grep -q 'Bourne-Again shell script,' ; then + if file "${filePath}" | grep -q 'Bourne-Again shell script' ; then return fi # make sure the site can be reached @@ -469,6 +469,8 @@ gameList=( "AudioDisc" "Battle Zone" "Bloodshed" + "Castaways" + "Castaways 2" #"Chopper Challenge" "Christmas WhoopAss" "Crazy Party" @@ -604,6 +606,22 @@ case "${game}" in cp "${cache}/bloodshed.exe" "$WINEPREFIX/drive_c/Program Files/" add_launcher "c:\Program Files\bloodshed.exe" ;; + "Castaways") + export winVer="win7" + install_wine_bottle vb6run dx8vb speechsdk + download "https://www.kaldobsky.com/audiogames/castaways.zip" + unzip -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" + ;; + "Castaways 2") + export winVer="win7" + install_wine_bottle vb6run dx8vb speechsdk + download "http://www.kaldobsky.com/audiogames/castaways2beta.zip" + unzip -d "$WINEPREFIX/drive_c/Program Files/castaways" "${cache}/castaways2beta.zip" + wine "c:\Program Files\castaways\Checkup.exe" /verysilent + add_launcher "c:\Program Files\castaways\Castaways2.exe" + ;; "Chopper Challenge") # Freezes at menu install_wine_bottle vb6run dx8vb speechsdk From 4e1f3bd61e5603cc7df4f1596996549d8653be6d Mon Sep 17 00:00:00 2001 From: Jeremiah Ticket Date: Fri, 18 Dec 2020 06:39:43 -0900 Subject: [PATCH 3/5] Fixed shabang! --- audiogame-manager.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index a30c132..da13b7b 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/env bash license() { cat << EOF From 57f6ec1e4be51fd86ba38c803f483fdd157f0c53 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sat, 19 Dec 2020 20:07:42 -0500 Subject: [PATCH 4/5] Updated sequence storm reader script to use the newly available self-voicing function available to orca from simple orca plugin system. --- audiogame-manager.sh | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index da13b7b..0a7ad82 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash license() { cat << EOF @@ -93,15 +93,16 @@ write_sequence_storm_reader() { # Here-document start cat << "EOF" > ~/.SequenceStormReader #!/usr/bin/env bash - + # Wait for the game to be launched -while ! pgrep -u $USER ^SequenceStorm &> /dev/null ; do +while ! pgrep -u "$USER" ^SequenceStorm &> /dev/null ; do sleep 0.05 done - + export DISPLAY=:0 unset cliptext -while pgrep -u $USER ^SequenceStorm &> /dev/null ; do +socketFile="$(find /tmp -maxdepth 1 -name "orca-*.sock")" +while pgrep -u "$USER" ^SequenceStorm &> /dev/null ; do if [[ "$(uname)" == "Darwin" ]]; then tmp="$(pbpaste 2> /dev/null)" else @@ -114,19 +115,27 @@ while pgrep -u $USER ^SequenceStorm &> /dev/null ; do if [[ "$(uname)" == "Darwin" ]]; then say -v alex -r 300 "$cliptext" else - spd-say -w -r 50 -- "$cliptext" + if [[ -w "${socketFile}" ]]; then + echo "<#APPEND#>$cliptext" | socat - UNIX-CLIENT:"${socketFile}" + else + spd-say -w -r 50 -- "$cliptext" + fi fi else if [[ "$(uname)" == "Darwin" ]]; then say -v alex -r 300 "$cliptext" else - spd-say -r 50 -- "$cliptext" + if [[ -w "${socketFile}" ]]; then + echo "$cliptext" | socat - UNIX-CLIENT:"${socketFile}" + else + spd-say -r 50 -- "$cliptext" + fi fi fi fi sleep 0.05 done - + exit 0 EOF # Here-document end From 53591857cbba086373b0a4b24d4ace37d7edafd3 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 20 Dec 2020 11:19:44 -0500 Subject: [PATCH 5/5] Changed the shabang back, we can just update it when compiling. --- audiogame-manager.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 0a7ad82..04ea23d 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash license() { cat << EOF