diff --git a/linux-game-manager.sh b/linux-game-manager.sh index 56ac7a3..d2cb3f8 100755 --- a/linux-game-manager.sh +++ b/linux-game-manager.sh @@ -609,14 +609,15 @@ case "${game}" in add_launcher "${installPath}/FS2_2.7_Linux/fs2.x86_64" "-ESpeakApplication=espeak-ng" ;; "Freedoom") + tobyVersion="6-0" doomPath="$(find /usr/share -type d -name "doom" 2> /dev/null)" if [[ ${#doomPath} -lt 5 ]]; then dialog --backtitle "Linux Game Manager" \ --yesno "Do you want Linux Game Manager to install freedoom and gzdoom for you? If you want to do this manually, select no." -1 -1 --stdout || exit 0 if command -v yay &> /dev/null ; then yay -Sy --noconfirm --sudoloop freedoom gzdoom - elif command -v slapt-get &> /dev/null ; then - su -c 'slapt-get -i freedoom gzdoom' + elif command -v slapt-src &> /dev/null ; then + su -c 'slapt-src -i freedoom gzdoom' elif command -v dnf &> /dev/null ; then sudo dnf copr -y enable nalika/gzdoom sudo dnf -q -y install freedoom @@ -627,28 +628,19 @@ case "${game}" in fi fi doomPath="$(find /usr/share -type d -name "doom" 2> /dev/null | head -1)" - download "https://www.dropbox.com/s/rsswh6m8hhjwp7g/Toby%20Acc%20Mod%20V5-1%20Update%20Fix.zip?dl=0" "https://www.dropbox.com/s/zzi4x9y6rg9yvja/TobyDoom2Deluxe_LevelsOnly.zip?dl=0" - if [[ ! -e "${doomPath}/TobyDeluxeMapPack_V5-1.pk3" ]]; then - if sudo unzip -d "${doomPath}" "${cache}/Toby Acc Mod V5-1 Update Fix.zip" ; then - sudo unzip -d "${doomPath}" "${cache}/TobyDoom2Deluxe_LevelsOnly.zip" - mkdir -p "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom" - cp "${doomPath}/gzdoom.ini" "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/" - grep -qx "Path=${doomPath}" "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/gzdoom.ini" || \ - sed -i "s;^\[IWADSearch.Directories\]$;[IWADSearch.Directories]\nPath=${doomPath};" "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/gzdoom.ini" - sed -i 's/Mouse1=+attack/Control+=attack/' "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/gzdoom.ini" - else - dialog --backtitle "Linux Game Manager" \ - --msgbox "Unable to extract files to ${doomPath}. Please extract ${cache}/Toby Acc Mod V5-1 Update Fix.zip manually." -1 -1 --stdout - exit 1 - fi + download "https://www.dropbox.com/s/turlowrn2s3l191/TobyAccessibilityMod_Version${tobyVersion}.zip?dl=0" + if [[ ! -e "${doomPath}/TobyDeluxeMapPack_V${tobyVersion}.pk3" ]]; then + mkdir -p "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom" + cp "${doomPath}/gzdoom.ini" "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/" + grep -qx "Path=${doomPath}" "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/gzdoom.ini" || \ + sed -i "s;^\[IWADSearch.Directories\]$;[IWADSearch.Directories]\nPath=${doomPath};" "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/gzdoom.ini" + sed -i 's/Mouse1=+attack/Control+=attack/' "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/gzdoom.ini" fi - add_launcher "$(command -v gzdoom) ${doomPath}/TobyAccModV5-1.pk3" - # Add in the Toby Mod Delux option - game="Freedoom Toby Mod Delux" - add_launcher "$(command -v gzdoom) ${doomPath}/TobyDeluxeMapPack_V5-1.pk3" - # Add in the Toby Mod Delux 2 option - game="Freedoom Toby Mod Delux 2" - add_launcher "$(command -v gzdoom) ${doomPath}/TobyD2Deluxe.pk3" + # Unmodified Doom with accessibility. + add_launcher "$(command -v gzdoom) ${doomPath}/TobyAccModV${tobyVersion%-*}.pk3" + # Toby accessibility mods + game="Freedoom Toby Mod" + add_launcher "$(command -v gzdoom) ${doomPath}/TobyAccModV${tobyVersion%-*}.pk3" ;; "Monkey Spank") check_dependencies python-pygame:pygame python-xdg:xdg python-pyperclip:pyperclip python-requests:requests python-setproctitle:setproctitle