Merge branch 'testing' in preparation for binary release.

This commit is contained in:
Storm Dragon 2021-05-04 12:08:09 -04:00
commit 250498706d

View File

@ -210,7 +210,7 @@ checklist() {
if command -v xdotool &> /dev/null ; then
echo "Xdotool is installed."
else
errorList+=("Warning: Xdotool is not installed. Some installlers may not work or may need manual intervention.")
errorList+=("Warning: Xdotool is not installed. Some installers may not work or may need manual intervention.")
fi
# Show the results
if [[ ${#errorList[@]} -eq 0 ]]; then
@ -286,15 +286,15 @@ echo "Loading documentation, please wait..."
# Try to find documentation based on common naming conventions.
local gamePath="$(winepath -u "$2" 2> /dev/null)"
gamePath="${gamePath%/*}"
local gameDoc="$(find "$gamePath" -type f -iname 'user_manual.html' | head -1)"
local gameDoc="$(find "$gamePath" -type f -iname 'user_manual.html' -or -iname 'user_manual.htm' | head -1)"
if [[ -z "$gameDoc" ]]; then
gameDoc="$(find "$gamePath" -type f -iname 'manual.html' | head -1)"
gameDoc="$(find "$gamePath" -type f -iname 'manual.html' -or -iname 'manual.htm' | head -1)"
fi
if [[ -z "$gameDoc" ]]; then
gameDoc="$(find "$gamePath" -type f -iname 'en.html' | head -1)"
gameDoc="$(find "$gamePath" -type f -iname 'en.html' -or -iname 'en.htm' | head -1)"
fi
if [[ -z "$gameDoc" ]]; then
gameDoc="$(find "$gamePath" -type f -iname 'readme.html' | head -1)"
gameDoc="$(find "$gamePath" -type f -iname 'readme.html' -or -iname 'readme.htm' | head -1)"
fi
if [[ -z "$gameDoc" ]]; then
gameDoc="$(find "$gamePath" -type f -iname 'manual.txt' | head -1)"
@ -522,6 +522,10 @@ game_launcher() {
if [[ "$game" =~ sequence-storm ]]; then
[[ -x ~/.SequenceStormReader ]] && ~/.SequenceStormReader &
fi
if [[ "$game" =~ audiodisc ]]; then
wine "$winePath\\$wineExec"
exit 0
fi
if [[ "$game" =~ audioquake ]]; then
wine "$winePath\\$wineExec"
exit 0
@ -617,6 +621,7 @@ gameList=(
"Finger Panic"
"Fuck That Bird"
"GMA Tank Commander"
"Golden Crayon"
"Hammer of Glory"
"Hunter"
"Insect Therapy"
@ -929,6 +934,14 @@ case "${game}" in
unzip -d "$WINEPREFIX/drive_c/Program Files/fuck that bird" "${cache}/bird_en.zip"
add_launcher "c:\Program Files\fuck that bird/game.exe"
;;
"Golden Crayon")
export winVer="win7"
install_wine_bottle speechsdk
download "http://tunmi13.ddns.net/projects/golden_crayon.zip"
unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/golden_crayon.zip"
find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
add_launcher "c:\Program Files\\golden_crayon/gc.exe"
;;
"GMA Tank Commander")
install_wine_bottle vb6run dx8vb speechsdk
download "http://www.gmagames.com/gtc120.exe"