From 4cefcfb0a033c4744e9c5d0001c02cc979670b2d Mon Sep 17 00:00:00 2001 From: Garux Date: Tue, 17 Oct 2017 12:19:10 +0300 Subject: [PATCH] Fix/add gamepacks links; workarounds for some games MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updating routes. Merge pull request #1 from NeonKnightOA/patch-2 Updating routes. Adding remaining gamepacks with respective links and setups. Merge pull request #2 from NeonKnightOA/patch-3 Adding remaining gamepacks with respective links and setups. Last route fixing and updating. My bad. Merge pull request #4 from NeonKnightOA/patch-4 Last route fixing and updating. My bad. Last update. It is now in its own project. Merge pull request #5 from NeonKnightOA/patch-5 Last update. It is now in its own project. From the Xonotic version of NetRadiant (update to the Unvanquished pack). Merge pull request #6 from NeonKnightOA/patch-6 From the Xonotic version of NetRadiant (update to the Unvanquished pa… Even more updates and gamepacks brought from Gitlab. Thanks to @illwieckz for this. Even more updates + workarounds for some games. Last of @illwieckz updates to the packs. Merge pull request #8 from NeonKnightOA/patch-7 Even more updates and gamepacks brought from Gitlab. Merge pull request #9 from NeonKnightOA/patch-8 Even more updates + workarounds for some games. Merge pull request #10 from NeonKnightOA/patch-9 Last of @illwieckz updates to the packs. --- download-gamepacks.sh | 42 +++++++++++++++++++++++++++++------------- install-gamepack.sh | 16 +++++++++++++--- install-gamepacks.sh | 4 ++-- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/download-gamepacks.sh b/download-gamepacks.sh index 7717cd2d..0d4a93c8 100755 --- a/download-gamepacks.sh +++ b/download-gamepacks.sh @@ -147,16 +147,32 @@ pack() } mkdir -p games -pack DarkPlacesPack GPL svn svn://svn.icculus.org/gtkradiant-gamepacks/DarkPlacesPack/branches/1.5/ -pack NexuizPack GPL gitdir git://git.icculus.org/divverent/nexuiz.git misc/netradiant-NexuizPack master -pack OpenArenaPack unknown zip1 http://ingar.satgnu.net/files/gtkradiant/gamepacks/OpenArenaPack.zip -pack OsirionPack GPL zip1 http://ingar.satgnu.net/files/gtkradiant/gamepacks/OsirionPack.zip -pack Q3Pack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk/ -r29 -pack Quake2Pack proprietary zip1 http://ingar.satgnu.net/files/gtkradiant/gamepacks/Quake2Pack.zip -pack Quake2WorldPack GPL svn svn://jdolan.dyndns.org/quake2world/trunk/gtkradiant -pack QuakePack GPL zip1 http://ingar.satgnu.net/files/gtkradiant/gamepacks/Quake1Pack.zip -pack TremulousPack proprietary zip1 http://ingar.satgnu.net/files/gtkradiant/gamepacks/TremulousPack.zip -pack UFOAIPack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/branches/1.5/ -#pack WarsowPack GPL svn https://svn.bountysource.com/wswpack/trunk/netradiant/games/WarsowPack/ -pack WarsowPack GPL zip1 http://ingar.satgnu.net/files/gtkradiant/gamepacks/WarsowPack.zip -pack XonoticPack GPL git http://git.xonotic.org/xonotic/netradiant-xonoticpack.git +pack DarkPlacesPack GPL svn svn://svn.icculus.org/gtkradiant-gamepacks/DarkPlacesPack/branches/1.5/ +pack Doom3Pack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/Doom3Pack/branches/1.5/ +pack ETPack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/ETPack/branches/1.5/ +pack Heretic2Pack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/Her2Pack/branches/1.5/ +pack JediAcademyPack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/JAPack/branches/1.5/ +pack NeverballPack proprietary zip1 http://ingar.intranifty.net/files/netradiant/gamepacks/NeverballPack.zip +pack NexuizPack GPL gitdir git://git.icculus.org/divverent/nexuiz.git misc/netradiant-NexuizPack master +#pack OpenArenaPack unknown zip1 http://ingar.satgnu.net/files/netradiant/gamepacks/OpenArenaPack.zip +pack OpenArenaPack GPL git https://github.com/NeonKnightOA/oagamepack.git +pack OsirionPack GPL zip1 http://ingar.intranifty.net/files/netradiant/gamepacks/OsirionPack.zip +pack PreyPack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/PreyPack/trunk/ +pack Q3Pack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk/ -r29 +pack Quake2Pack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/Q2Pack/branches/1.5/ +pack Quake4Pack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/Q4Pack/branches/1.5/ +#pack QuakePack proprietary zip1 http://ingar.intranifty.net/files/netradiant/gamepacks/QuakePack.zip +pack QuakePack GPL zip1 http://ingar.intranifty.net/files/netradiant/gamepacks/Quake1Pack.zip +#pack Quake2WorldPack GPL svn svn://jdolan.dyndns.org/quake2world/trunk/gtkradiant +pack QuetooPack GPL svn svn://svn.icculus.org/gtkradiant-gamepacks/QuetooPack/branches/1.5/ +#pack TremulousPack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/TremulousPack/branches/1.5/ +pack TremulousPack proprietary zip1 http://ingar.intranifty.net/files/netradiant/gamepacks/TremulousPack.zip +pack TurtleArenaPack proprietary git https://github.com/Turtle-Arena/turtle-arena-radiant-pack.git +pack UFOAIPack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/branches/1.5/ +#pack UnvanquishedPack unknown zip1 http://ingar.intranifty.net/gtkradiant/files/gamepacks/UnvanquishedPack.zip +pack UnvanquishedPack BSD svn https://github.com/Unvanquished/unvanquished-mapeditor-support.git/trunk/build/netradiant +#pack WarsowPack GPL svn https://svn.bountysource.com/wswpack/trunk/netradiant/games/WarsowPack/ +#pack WarsowPack GPL zip1 http://ingar.intranifty.net/files/netradiant/gamepacks/WarsowPack.zip +pack WarsowPack GPL git https://github.com/Warsow/NetRadiantPack.git +pack WolfPack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/WolfPack/branches/1.5/ +pack XonoticPack GPL git https://gitlab.com/xonotic/netradiant-xonoticpack.git diff --git a/install-gamepack.sh b/install-gamepack.sh index 3a36c200..9d222c74 100755 --- a/install-gamepack.sh +++ b/install-gamepack.sh @@ -12,9 +12,19 @@ set -ex pack=$1 dest=$2 -if [ -d "$pack/tools" ]; then - pack="$pack/tools" -fi +# Some per-game workaround for malformed gamepack +case $pack in + */JediAcademyPack) + pack="$pack/Tools" + ;; + */PreyPack|*/Q3Pack) + pack="$pack/tools" + ;; + */WolfPack) + pack="$pack/bin" + ;; +esac + for GAMEFILE in "$pack/games"/*.game; do if [ x"$GAMEFILE" != x"$pack/games/*.game" ]; then $CP "$GAMEFILE" "$dest/games/" diff --git a/install-gamepacks.sh b/install-gamepacks.sh index f4ae8428..df9a6b0d 100755 --- a/install-gamepacks.sh +++ b/install-gamepacks.sh @@ -19,8 +19,8 @@ case "$DOWNLOAD_GAMEPACKS" in esac set -e -for GAME in games/*; do - if [ "$GAME" = "games/*" ]; then +for GAME in games/*Pack; do + if [ "$GAME" = "games/*Pack" ]; then $ECHO "Game packs not found, please run" $ECHO " ./download-gamepacks.sh" $ECHO "and then try again!"