diff --git a/.install/FreeDoom.sh b/.install/FreeDoom.sh index fa4a8c9..e1ea29a 100644 --- a/.install/FreeDoom.sh +++ b/.install/FreeDoom.sh @@ -1,4 +1,4 @@ -tobyVersion="8-0" +tobyVersion="9.0" mkdir -p "${installPath}/doom" doomPath="$(find /usr/share -type d -name "doom" 2> /dev/null)" if [[ ${#doomPath} -lt 5 ]]; then @@ -17,27 +17,14 @@ if [[ ${#doomPath} -lt 5 ]]; then fi fi doomPath="$(find /usr/share -type d -name "doom" 2> /dev/null | head -1)" -if ! [[ -e "${installPath}/doom/DoomMetalVol6.wad" ]] && ! [[ -e "${installPath}/doom/DoomMetalVol7.wad" ]]; then - alert - choice=$(ui_menu "Doom Metal Selection" "Doom Metal Selection" "Would you like Doom Metal Volume 6 or 7?" "6" "Doom Metal Volume 6" "7" "Doom Metal Volume 7" "none" "None") - case "$choice" in - "6") - download "${ipfsGateway}/ipfs/QmSzWKtP3wPvzn5GNd9F7n4RAhkFHxh2UHxXGefiAufwQW?filename=DoomMetalVol6.wad" - ;; - "7") - download "${ipfsGateway}/ipfs/QmfXkz3tzicKGfhcYSiWUZkjkDKP2aVp53Y49n127wMr7D?filename=DoomMetalVol7.wad" - ;; - esac -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/QmRSyAGQPaRtWwH9aT87Q8rKini9GYXac92B9EkBZJtbJ1?filename=TobyAccessibilityMod_V${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_V${tobyVersion}.zip" +download "${ipfsGateway}/ipfs/QmdbLQofHiypCseiZEwcZVrrbP2T3DbKteVM9DF7cwHEqb?filename=toby_doom_${tobyVersion}_full.zip" +unzip -n -d "${installPath}/doom" "${cache}/toby_doom_${tobyVersion}_full.zip" #unzip -n -d "${installPath}/doom" "${cache}/OpMDK_ForV${tobyVersion}.zip" cp -v "${cache}/keyshare-universal.pk3" "${installPath}/doom" -rm -fv "${installPath}/doom/"*.{ahk,bat,exe,dll,ps1} +rm -fv "${installPath}/doom/"*.{bat,exe,dll,ps1} +rm -rfv "${installPath}/doom/_internal" #if [[ -e /usr/share/doom/blasphem.wad ]]; then #ln -s /usr/share/doom/blasphem.wad "${installPath}/doom/" #fi