Merge branch 'testing' for new binary release
This commit is contained in:
commit
f7623868fc
@ -185,6 +185,11 @@ checklist() {
|
|||||||
else
|
else
|
||||||
errorList+=("Warning: ocrdesktop is not installed. It can help if the installer gets stuck to figure out what is happening.")
|
errorList+=("Warning: ocrdesktop is not installed. It can help if the installer gets stuck to figure out what is happening.")
|
||||||
fi
|
fi
|
||||||
|
if command -v qjoypad &> /dev/null ; then
|
||||||
|
echo "Qjoypad is installed."
|
||||||
|
else
|
||||||
|
errorList+=("Warning: qjoypad is not installed. Qjoypad allows you to play keyboard only games with a gamepad.")
|
||||||
|
fi
|
||||||
if command -v unix2dos &> /dev/null ; then
|
if command -v unix2dos &> /dev/null ; then
|
||||||
echo "Dos2unix is installed."
|
echo "Dos2unix is installed."
|
||||||
else
|
else
|
||||||
@ -251,7 +256,7 @@ download() {
|
|||||||
# Skip if the item is in cache.
|
# Skip if the item is in cache.
|
||||||
test -e "${cache}/${dest}" && continue
|
test -e "${cache}/${dest}" && continue
|
||||||
if ! wget -4 -O "${cache}/${dest}" "${i}" ; then
|
if ! wget -4 -O "${cache}/${dest}" "${i}" ; then
|
||||||
echo "Could not download..."
|
echo "Could not download \"$i\"..."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@ -278,8 +283,19 @@ install_wine_bottle() {
|
|||||||
export WINEPREFIX="$HOME/.local/wine/${bottle}"
|
export WINEPREFIX="$HOME/.local/wine/${bottle}"
|
||||||
# Arguments to the function are dependancies to be installed.
|
# Arguments to the function are dependancies to be installed.
|
||||||
(DISPLAY="" wineboot -u
|
(DISPLAY="" wineboot -u
|
||||||
wine msiexec /i z:$(find /usr/share/wine/mono -name "wine-mono*x86.msi") /quiet
|
# Get location of mono and gecko.
|
||||||
wine msiexec /i z:$(find /usr/share/wine/gecko -name "wine-gecko*x86.msi") /quiet
|
monoPath="$(find /usr/share/wine/mono -name "wine-mono*x86.msi")"
|
||||||
|
geckoPath="$(find /usr/share/wine/gecko -name "wine-gecko*x86.msi")"
|
||||||
|
if [[ -z "$monoPath" ]]; then
|
||||||
|
download 'http://dl.winehq.org/wine/wine-mono/6.0.0/wine-mono-6.0.0-x86.msi'
|
||||||
|
monoPath="${cache}/wine-mono-6.0.0-x86.msi"
|
||||||
|
fi
|
||||||
|
if [[ -z "$geckoPath" ]]; then
|
||||||
|
download 'http://dl.winehq.org/wine/wine-gecko/2.40/wine_gecko-2.40-x86.msi'
|
||||||
|
geckoPath="${cache}/wine_gecko-2.40-x86.msi"
|
||||||
|
fi
|
||||||
|
wine msiexec /i z:"$monoPath" /quiet
|
||||||
|
wine msiexec /i z:"$geckoPath" /quiet
|
||||||
winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}) | dialog --progressbox "Installing wine bottle, please wait..." -1 -1
|
winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}) | dialog --progressbox "Installing wine bottle, please wait..." -1 -1
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -304,7 +320,7 @@ game_installer() {
|
|||||||
echo "All games are already installed."
|
echo "All games are already installed."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
menuList+=("Make a One Time Donation" "Make a One Time Donation")
|
menuList+=("Donate" "Donate")
|
||||||
menuList+=("Become a Patron" "Become a Patron")
|
menuList+=("Become a Patron" "Become a Patron")
|
||||||
game="$(dialog --backtitle "Audio Game Installer" \
|
game="$(dialog --backtitle "Audio Game Installer" \
|
||||||
--clear \
|
--clear \
|
||||||
@ -324,15 +340,15 @@ game_removal() {
|
|||||||
for i in "${lines[@]}" ; do
|
for i in "${lines[@]}" ; do
|
||||||
menuList+=("${i%|*}" "${i##*|}")
|
menuList+=("${i%|*}" "${i##*|}")
|
||||||
done
|
done
|
||||||
menuList+=("Make a One Time Donation" "Make a One Time Donation")
|
menuList+=("Donate" "Donate")
|
||||||
menuList+=("Become a Patron" "Become a Patron")
|
menuList+=("Become a Patron" "Become a Patron")
|
||||||
local game="$(dialog --backtitle "Audio Game Removal" \
|
local game="$(dialog --backtitle "Audio Game Removal" \
|
||||||
--clear \
|
--clear \
|
||||||
--no-tags \
|
--no-tags \
|
||||||
--menu "Please select a game to delete" 0 0 0 "${menuList[@]}" --stdout)"
|
--menu "Please select a game to delete" 0 0 0 "${menuList[@]}" --stdout)"
|
||||||
if [[ ${#game} -gt 0 ]]; then
|
if [[ ${#game} -gt 0 ]]; then
|
||||||
if [[ "$game" == "Make a One Time Donation" ]]; then
|
if [[ "$game" == "Donate" ]]; then
|
||||||
open_url "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=stormdragon2976@gmail.com&lc=US&item_name=Donation+to+Storm+Games&no_note=0&cn=¤cy_code=USD&bn=PP-DonationsBF:btn_donateCC_LG.gif:NonHosted"
|
open_url "https://ko-fi.com/stormux"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
if [[ "$game" == "Become a Patron" ]]; then
|
if [[ "$game" == "Become a Patron" ]]; then
|
||||||
@ -367,15 +383,15 @@ kill_game() {
|
|||||||
for i in "${lines[@]}" ; do
|
for i in "${lines[@]}" ; do
|
||||||
menuList+=("${i%|*}" "${i##*|}")
|
menuList+=("${i%|*}" "${i##*|}")
|
||||||
done
|
done
|
||||||
menuList+=("Make a One Time Donation" "Make a One Time Donation")
|
menuList+=("Donate" "Donate")
|
||||||
menuList+=("Become a Patron" "Become a Patron")
|
menuList+=("Become a Patron" "Become a Patron")
|
||||||
local game="$(dialog --backtitle "Audio Game Killer" \
|
local game="$(dialog --backtitle "Audio Game Killer" \
|
||||||
--clear \
|
--clear \
|
||||||
--no-tags \
|
--no-tags \
|
||||||
--menu "Please select a game to force stop" 0 0 0 "${menuList[@]}" --stdout)"
|
--menu "Please select a game to force stop" 0 0 0 "${menuList[@]}" --stdout)"
|
||||||
if [[ ${#game} -gt 0 ]]; then
|
if [[ ${#game} -gt 0 ]]; then
|
||||||
if [[ "$game" == "Make a One Time Donation" ]]; then
|
if [[ "$game" == "Donate" ]]; then
|
||||||
open_url "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=stormdragon2976@gmail.com&lc=US&item_name=Donation+to+Storm+Games&no_note=0&cn=¤cy_code=USD&bn=PP-DonationsBF:btn_donateCC_LG.gif:NonHosted"
|
open_url "https://ko-fi.com/stormux"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
if [[ "$game" == "Become a Patron" ]]; then
|
if [[ "$game" == "Become a Patron" ]]; then
|
||||||
@ -407,7 +423,7 @@ game_launcher() {
|
|||||||
for i in "${lines[@]}" ; do
|
for i in "${lines[@]}" ; do
|
||||||
menuList+=("${i%|*}" "${i##*|}")
|
menuList+=("${i%|*}" "${i##*|}")
|
||||||
done
|
done
|
||||||
menuList+=("Make a One Time Donation" "Make a One Time Donation")
|
menuList+=("Donate" "Donate")
|
||||||
menuList+=("Become a Patron" "Become a Patron")
|
menuList+=("Become a Patron" "Become a Patron")
|
||||||
local game="$(dialog --backtitle "Audio Game Launcher" \
|
local game="$(dialog --backtitle "Audio Game Launcher" \
|
||||||
--clear \
|
--clear \
|
||||||
@ -422,8 +438,8 @@ game_launcher() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ ${#game} -gt 0 ]]; then
|
if [[ ${#game} -gt 0 ]]; then
|
||||||
if [[ "$game" == "Make a One Time Donation" ]]; then
|
if [[ "$game" == "Donate" ]]; then
|
||||||
open_url "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=stormdragon2976@gmail.com&lc=US&item_name=Donation+to+Storm+Games&no_note=0&cn=¤cy_code=USD&bn=PP-DonationsBF:btn_donateCC_LG.gif:NonHosted"
|
open_url "https://ko-fi.com/stormux"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
if [[ "$game" == "Become a Patron" ]]; then
|
if [[ "$game" == "Become a Patron" ]]; then
|
||||||
@ -515,6 +531,7 @@ gameList=(
|
|||||||
"Adrian's Doom"
|
"Adrian's Doom"
|
||||||
"Adventurers At C"
|
"Adventurers At C"
|
||||||
"AudioDisc"
|
"AudioDisc"
|
||||||
|
"Battle of the Hunter"
|
||||||
"Battle Zone"
|
"Battle Zone"
|
||||||
"Bloodshed"
|
"Bloodshed"
|
||||||
"Castaways"
|
"Castaways"
|
||||||
@ -529,6 +546,7 @@ gameList=(
|
|||||||
"Easter Quest"
|
"Easter Quest"
|
||||||
#"Entombed"
|
#"Entombed"
|
||||||
#"Eurofly"
|
#"Eurofly"
|
||||||
|
"Extant"
|
||||||
"Fantasy Story II"
|
"Fantasy Story II"
|
||||||
#"Fartman"
|
#"Fartman"
|
||||||
"Finger Panic"
|
"Finger Panic"
|
||||||
@ -555,7 +573,6 @@ gameList=(
|
|||||||
"Perilous Hearts"
|
"Perilous Hearts"
|
||||||
"Pontes Kickups!"
|
"Pontes Kickups!"
|
||||||
"Q9"
|
"Q9"
|
||||||
"Revenge of the Undead"
|
|
||||||
"Rhythm Rage"
|
"Rhythm Rage"
|
||||||
#"River raiders"
|
#"River raiders"
|
||||||
"RS Games"
|
"RS Games"
|
||||||
@ -565,6 +582,7 @@ gameList=(
|
|||||||
"Shades of Doom"
|
"Shades of Doom"
|
||||||
#"Silver Dollar"
|
#"Silver Dollar"
|
||||||
"Slender Lost Vision"
|
"Slender Lost Vision"
|
||||||
|
"Sonic Zoom"
|
||||||
"Super Egg Hunt"
|
"Super Egg Hunt"
|
||||||
"Super Liam"
|
"Super Liam"
|
||||||
#"Super Mario Bros"
|
#"Super Mario Bros"
|
||||||
@ -652,6 +670,14 @@ case "${game}" in
|
|||||||
unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/audiodisc.zip"
|
unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/audiodisc.zip"
|
||||||
add_launcher "c:\Program Files\audiodisc\disco.exe"
|
add_launcher "c:\Program Files\audiodisc\disco.exe"
|
||||||
;;
|
;;
|
||||||
|
"Battle of the Hunter")
|
||||||
|
export winVer="win7"
|
||||||
|
install_wine_bottle speechsdk
|
||||||
|
download "https://tunmi13.dev/projects/bth.zip"
|
||||||
|
unzip -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"
|
||||||
|
;;
|
||||||
"Battle Zone")
|
"Battle Zone")
|
||||||
export winVer="win7"
|
export winVer="win7"
|
||||||
install_wine_bottle speechsdk
|
install_wine_bottle speechsdk
|
||||||
@ -757,6 +783,12 @@ case "${game}" in
|
|||||||
unzip -d "$WINEPREFIX/drive_c/Eurofly" "${cache}/Launcher_1.2.zip"
|
unzip -d "$WINEPREFIX/drive_c/Eurofly" "${cache}/Launcher_1.2.zip"
|
||||||
add_launcher "c:\Eurofly\launcher.exe"
|
add_launcher "c:\Eurofly\launcher.exe"
|
||||||
;;
|
;;
|
||||||
|
"Extant")
|
||||||
|
install_wine_bottle speechsdk
|
||||||
|
download "https://agarchive.net/games/other/extant.zip"
|
||||||
|
unzip -d "$WINEPREFIX/drive_c/Program Files/extant" "${cache}/extant.zip"
|
||||||
|
add_launcher "c:\Program Files\extant\Extant.exe"
|
||||||
|
;;
|
||||||
"Fantasy Story II")
|
"Fantasy Story II")
|
||||||
export winVer="win10"
|
export winVer="win10"
|
||||||
install_wine_bottle speechsdk
|
install_wine_bottle speechsdk
|
||||||
@ -1007,14 +1039,6 @@ EOF
|
|||||||
wine "${cache}/q9_english_installer.exe" /silent
|
wine "${cache}/q9_english_installer.exe" /silent
|
||||||
add_launcher "c:\Program Files\Q9 Action Game\q9.exe"
|
add_launcher "c:\Program Files\Q9 Action Game\q9.exe"
|
||||||
;;
|
;;
|
||||||
"Revenge of the Undead")
|
|
||||||
export winVer="win7"
|
|
||||||
install_wine_bottle speechsdk
|
|
||||||
download "https://tunmi13.dev/projects/rotu.zip"
|
|
||||||
unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/rotu.zip"
|
|
||||||
rm -fv "${WINEPREFIX}/drive_c/Program Files/rotu/nvdaControllerClient32.dll"
|
|
||||||
add_launcher "c:\Program Files\rotu\rotu.exe"
|
|
||||||
;;
|
|
||||||
"Rhythm Rage")
|
"Rhythm Rage")
|
||||||
export winVer="win7"
|
export winVer="win7"
|
||||||
install_wine_bottle speechsdk
|
install_wine_bottle speechsdk
|
||||||
@ -1092,6 +1116,13 @@ EOF
|
|||||||
download "https://www.iamtalon.me/games/slender.zip"
|
download "https://www.iamtalon.me/games/slender.zip"
|
||||||
unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/slender.zip"
|
unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/slender.zip"
|
||||||
add_launcher "c:\Program Files\slender\slender.exe"
|
add_launcher "c:\Program Files\slender\slender.exe"
|
||||||
|
;;
|
||||||
|
"Sonic Zoom")
|
||||||
|
export winVer="win7"
|
||||||
|
install_wine_bottle speechsdk
|
||||||
|
download "http://wwwx.cs.unc.edu/Research/assist/et/projects/SonicZoom/soniczoom11.zip"
|
||||||
|
unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/soniczoom11.zip"
|
||||||
|
add_launcher "c:\Program Files\Sonic Zoom\SonicZoom.exe"
|
||||||
;;
|
;;
|
||||||
"Super Egg Hunt")
|
"Super Egg Hunt")
|
||||||
install_wine_bottle
|
install_wine_bottle
|
||||||
@ -1224,8 +1255,8 @@ EOF
|
|||||||
7z e -o"$WINEPREFIX/drive_c/Program Files/World of War" "${cache}/world of war English.7z"
|
7z e -o"$WINEPREFIX/drive_c/Program Files/World of War" "${cache}/world of war English.7z"
|
||||||
#add_launcher "c:\Program Files\"
|
#add_launcher "c:\Program Files\"
|
||||||
;;
|
;;
|
||||||
"Make a One Time Donation")
|
"Donate")
|
||||||
open_url "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=stormdragon2976@gmail.com&lc=US&item_name=Donation+to+Storm+Games&no_note=0&cn=¤cy_code=USD&bn=PP-DonationsBF:btn_donateCC_LG.gif:NonHosted"
|
open_url "https://ko-fi.com/stormux"
|
||||||
;;
|
;;
|
||||||
"Become a Patron")
|
"Become a Patron")
|
||||||
open_url "https://patreon.com/stormux"
|
open_url "https://patreon.com/stormux"
|
||||||
|
@ -1,49 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
#
|
|
||||||
# âe contents of this file are subject to the Common Public Attribution
|
|
||||||
# License Version 1.0 (the âcenseâ you may not use this file except in
|
|
||||||
# compliance with the License. You may obtain a copy of the License at
|
|
||||||
# https://opensource.org/licenses/CPAL-1.0. The License is based on the Mozilla Public License Version
|
|
||||||
# 1.1 but Sections 14 and 15 have been added to cover use of software over a
|
|
||||||
# computer network and provide for limited attribution for the Original
|
|
||||||
# Developer. In addition, Exhibit A has been modified to be consistent with
|
|
||||||
# Exhibit B.
|
|
||||||
#
|
|
||||||
# Software distributed under the License is distributed on an â ISâasis,
|
|
||||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
||||||
# for the specific language governing rights and limitations under the
|
|
||||||
# License.
|
|
||||||
#
|
|
||||||
# The Original Code is audiogame manager.
|
|
||||||
#
|
|
||||||
# The Original Developer is not the Initial Developer and is . If
|
|
||||||
# left blank, the Original Developer is the Initial Developer.
|
|
||||||
#
|
|
||||||
# The Initial Developer of the Original Code is Billy "Storm Dragon" Wolfe. All portions of
|
|
||||||
# the code written by Billy Wolfe are Copyright (c) 2020. All Rights
|
|
||||||
# Reserved.
|
|
||||||
#
|
|
||||||
# Contributor Michael Taboada.
|
|
||||||
#
|
|
||||||
# Contributor Jeremiah Ticket.
|
|
||||||
#
|
|
||||||
# Attribution Copyright Notice: Audiogame manager copyright 2020 Storm Dragon. All rights reserved.
|
|
||||||
#
|
|
||||||
# Attribution Phrase (not exceeding 10 words): A Stormux project
|
|
||||||
#
|
|
||||||
# Attribution URL: https://stormgames.wolfe.casa
|
|
||||||
#
|
|
||||||
# Graphic Image as provided in the Covered Code, if any.
|
|
||||||
#
|
|
||||||
# Display of Attribution Information is required in Larger
|
|
||||||
# Works which are defined in the CPAL as a work which combines Covered Code
|
|
||||||
# or portions thereof with code not governed by the terms of the CPAL.
|
|
||||||
|
|
||||||
cache="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/cache"
|
|
||||||
url="https://tunmi13.dev/projects/rotu.zip"
|
|
||||||
(rm -v "${cache}/rotu.zip"
|
|
||||||
wget -O "${cache}/rotu.zip" "$url" || exit 1
|
|
||||||
unzip -od "$HOME/.local/wine/revenge-of-the-undead/drive_c/Program Files" "${cache}/rotu.zip"
|
|
||||||
rm -fv "$HOME/.local/wine/drive_c/Program Files/rotu/nvdaControllerClient32.dll") | dialog --progressbox "updating Revenge of the undead, please wait..." -1 -1
|
|
||||||
|
|
||||||
exit 0
|
|
@ -48,7 +48,7 @@ extract_error() {
|
|||||||
|
|
||||||
|
|
||||||
# Set the swamp directory
|
# Set the swamp directory
|
||||||
pushd ~/.local/wine/swamp
|
pushd ~/.local/wine/swamp/drive_c/Program\ Files/swamp
|
||||||
|
|
||||||
# Restore the directory stack on exit.
|
# Restore the directory stack on exit.
|
||||||
trap popd EXIT
|
trap popd EXIT
|
||||||
|
Loading…
Reference in New Issue
Block a user