From 3bdc8d6eade3a806985019f3569aa8221201afea Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Mon, 19 Aug 2024 01:50:11 -0400 Subject: [PATCH] Updates to the installer for Doom and the launcher scripts for custom games contain Project Brutality. Some manual intervention is required if you do not want to reinstall. See https://forum.audiogames.net/post/863139/#p863139 for details. --- .../Project_Brutality Latest_Operation_MDK.sh | 28 +++++++++++++++++ .../Project_Brutality Latest_Toby_Deluxe.sh | 29 ++++++++++++++++++ .../Project_Brutality Latest_Toby_Demo.sh | 30 +++++++++++++++++++ .../Project_Brutality_Operation_MDK.sh | 5 ++-- .../Project_Brutality_Toby_Deluxe.sh | 5 ++-- .../TobyCustom/Project_Brutality_Toby_Demo.sh | 5 ++-- linux-game-manager.sh | 4 +-- 7 files changed, 95 insertions(+), 11 deletions(-) create mode 100755 .scripts/TobyCustom/Project_Brutality Latest_Operation_MDK.sh create mode 100755 .scripts/TobyCustom/Project_Brutality Latest_Toby_Deluxe.sh create mode 100755 .scripts/TobyCustom/Project_Brutality Latest_Toby_Demo.sh diff --git a/.scripts/TobyCustom/Project_Brutality Latest_Operation_MDK.sh b/.scripts/TobyCustom/Project_Brutality Latest_Operation_MDK.sh new file mode 100755 index 0000000..81cadae --- /dev/null +++ b/.scripts/TobyCustom/Project_Brutality Latest_Operation_MDK.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Set the current path to the Doom path required by some OS. +pushd "${doomPath}" + +gamePath=~/.local/games/doom +# Set up the pk3 and wad files +gameOption=( + "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" + "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* + "${gamePath}/OpMDK.wad" + "${gamePath}/Project_Brutality-Latest.pk3" +) + +# Check for and include if present a wad. Some people may not have it. +if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then + gameOption+=("${gamePath}/DoomMetalVol7.wad") +elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then + gameOption+=("${gamePath}/DoomMetalVol6.wad") +fi + +# Source common variable extensions. +pbrc="$(find "${0%/*}/" -type f -name '.projectbrutalityrc')" +source "${pbrc}" + +# Launch the game and pipe things to be spoken through speech-dispatcher. +# This also leaves the console output intact for people who may want to read it. +exec stdbuf -oL ${gzdoom} ${gameOption[@]} | while IFS= read -r l ; do echo "$l" | { grep "${grepStrings[@]}" | grep "${antiGrepStrings[@]}" | sed "${sedStrings[@]}" | spd-say -e ${spd_module} ${spd_pitch} ${spd_rate} ${spd_voice} ${spd_volume} -- > /dev/null 2>&1; }; echo "$l";done diff --git a/.scripts/TobyCustom/Project_Brutality Latest_Toby_Deluxe.sh b/.scripts/TobyCustom/Project_Brutality Latest_Toby_Deluxe.sh new file mode 100755 index 0000000..dbe8659 --- /dev/null +++ b/.scripts/TobyCustom/Project_Brutality Latest_Toby_Deluxe.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Set the current path to the Doom path required by some OS. +pushd "${doomPath}" + +gamePath=~/.local/games/doom + +# Set up the pk3 and wad files +gameOption=( + "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" + "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* + "${gamePath}/TobyDoomLevels.wad" + "${gamePath}/Project_Brutality-Latest.pk3" +) + +# Check for and include if present a wad. Some people may not have it. +if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then + gameOption+=("${gamePath}/DoomMetalVol7.wad") +elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then + gameOption+=("${gamePath}/DoomMetalVol6.wad") +fi + +# Source common variable extensions. +pbrc="$(find "${0%/*}/" -type f -name '.projectbrutalityrc')" +source "${pbrc}" + +# Launch the game and pipe things to be spoken through speech-dispatcher. +# This also leaves the console output intact for people who may want to read it. +exec stdbuf -oL ${gzdoom} ${gameOption[@]} | while IFS= read -r l ; do echo "$l" | { grep "${grepStrings[@]}" | grep "${antiGrepStrings[@]}" | sed "${sedStrings[@]}" | spd-say -e ${spd_module} ${spd_pitch} ${spd_rate} ${spd_voice} ${spd_volume} -- > /dev/null 2>&1; }; echo "$l";done diff --git a/.scripts/TobyCustom/Project_Brutality Latest_Toby_Demo.sh b/.scripts/TobyCustom/Project_Brutality Latest_Toby_Demo.sh new file mode 100755 index 0000000..316a522 --- /dev/null +++ b/.scripts/TobyCustom/Project_Brutality Latest_Toby_Demo.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +# Set the current path to the Doom path required by some OS. +pushd "${doomPath}" + +gamePath=~/.local/games/doom + +# Set up the pk3 and wad files +gameOption=( + "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" + "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* + "${gamePath}/Toby-Demo-Level.wad" + "${gamePath}/PB-Toby-Compatibility-Addon.pk3" + "${gamePath}/Project_Brutality-Latest.pk3" +) + +# Check for and include if present a wad. Some people may not have it. +if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then + gameOption+=("${gamePath}/DoomMetalVol7.wad") +elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then + gameOption+=("${gamePath}/DoomMetalVol6.wad") +fi + +# Source common variable extensions. +pbrc="$(find "${0%/*}/" -type f -name '.projectbrutalityrc')" +source "${pbrc}" + +# Launch the game and pipe things to be spoken through speech-dispatcher. +# This also leaves the console output intact for people who may want to read it. +exec stdbuf -oL ${gzdoom} ${gameOption[@]} | while IFS= read -r l ; do echo "$l" | { grep "${grepStrings[@]}" | grep "${antiGrepStrings[@]}" | sed "${sedStrings[@]}" | spd-say -e ${spd_module} ${spd_pitch} ${spd_rate} ${spd_voice} ${spd_volume} -- > /dev/null 2>&1; }; echo "$l";done diff --git a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh index 6cb49c8..29a3b00 100755 --- a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh +++ b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh @@ -9,9 +9,8 @@ gameOption=( "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* "${gamePath}/OpMDK.wad" - "$(find ~/.local/games/doom -name 'PB-Toby-Compatibility-Addon.pk3')" - "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" - "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')" + "${gamePath}/PB-Toby-Compatibility-Addon.pk3" + "${gamePath}/Project_Brutality.pk3" ) # Check for and include if present a wad. Some people may not have it. diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh index 47353e7..f52f1be 100755 --- a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh +++ b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh @@ -10,9 +10,8 @@ gameOption=( "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* "${gamePath}/TobyDoomLevels.wad" - "$(find ~/.local/games/doom -name 'PB-Toby-Compatibility-Addon.pk3')" - "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" - "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')" + "${gamePath}/PB-Toby-Compatibility-Addon.pk3" + "${gamePath}/Project_Brutality.pk3" ) # Check for and include if present a wad. Some people may not have it. diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh index 0400b09..f4b3585 100755 --- a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh +++ b/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh @@ -10,9 +10,8 @@ gameOption=( "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* "${gamePath}/Toby-Demo-Level.wad" - "$(find ~/.local/games/doom -name 'PB-Toby-Compatibility-Addon.pk3')" - "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" - "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')" + "${gamePath}/PB-Toby-Compatibility-Addon.pk3" + "${gamePath}/Project_Brutality.pk3" ) # Check for and include if present a wad. Some people may not have it. diff --git a/linux-game-manager.sh b/linux-game-manager.sh index c55332a..42cf0bf 100755 --- a/linux-game-manager.sh +++ b/linux-game-manager.sh @@ -716,13 +716,13 @@ case "${game}" in fi # The url breaks the normal download function download_named "keyshare-universal.pk3" "https://forum.zdoom.org/download/file.php?id=42262" - download "${ipfsGateway}/ipfs/QmNtn1bugWQg2Y8rB29FH6zYzthsebxmpuMcHcErprzx3z?filename=TobyAccessibilityMod_Version${tobyVersion}.zip" "${ipfsGateway}/ipfs/QmNUfYa5P9J6EaDZoGvsiG2ArMR3BCc3gTcW3wPo1HABLU?filename=OpMDK_ForV${tobyVersion}.zip" + download "${ipfsGateway}/ipfs/QmPgGpt4HZZbNv2p32gisEDpBsZhZqEmJJgQDY33x27xXV?filename=TobyAccessibilityMod_Version${tobyVersion}.zip" "${ipfsGateway}/ipfs/QmNUfYa5P9J6EaDZoGvsiG2ArMR3BCc3gTcW3wPo1HABLU?filename=OpMDK_ForV${tobyVersion}.zip" [[ -e "${cache}/DoomMetalVol6.wad" ]] && mv "${cache}/DoomMetalVol6.wad" "${installPath}/doom" [[ -e "${cache}/DoomMetalVol7.wad" ]] && mv "${cache}/DoomMetalVol7.wad" "${installPath}/doom" unzip -n -d "${installPath}/doom" "${cache}/TobyAccessibilityMod_Version${tobyVersion}.zip" unzip -n -d "${installPath}/doom" "${cache}/OpMDK_ForV${tobyVersion}.zip" cp -v "${cache}/keyshare-universal.pk3" "${installPath}/doom" - rm -fv "${installPath}/doom/"*.{bat,dll,exe} + rm -fv "${installPath}/doom/"*.{ahk|bat,exe,dll,ps1} if [[ -e /usr/share/doom/blasphem.wad ]]; then ln -s /usr/share/doom/blasphem.wad "${installPath}/doom/" fi