X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=download-gamepacks.sh;h=7717cd2dcb961845d3c78bec9e98939f9caa8e08;hb=e995cc897b8a0d2b2828612cb0b226b7520fea86;hp=a12c6e7eff93bc384c5f93def8ac2a3d12c082fb;hpb=3e1aeb567443fe025438937e50e2615afbb35658;p=xonotic%2Fnetradiant.git

diff --git a/download-gamepacks.sh b/download-gamepacks.sh
index a12c6e7e..7717cd2d 100755
--- a/download-gamepacks.sh
+++ b/download-gamepacks.sh
@@ -9,9 +9,9 @@
 : ${WGET:=wget}
 : ${ECHO:=echo}
 : ${MKDIR:=mkdir}
-: ${RM_R:=rm -r}
+: ${RM_R:=rm -f -r}
 : ${MV:=mv}
-: ${UNZIP:=unzip}
+: ${UNZIPPER:=unzip}
 
 set -e
 
@@ -42,7 +42,7 @@ pack()
 				$MKDIR zipdownload
 				cd zipdownload
 				$WGET "$source" "$@" || true
-				$UNZIP *
+				$UNZIPPER *.zip || true
 				cd ..
 				$RM_R "games/$pack"
 				$MKDIR "games/$pack"
@@ -119,7 +119,7 @@ pack()
 			$MKDIR zipdownload
 			cd zipdownload
 			$WGET "$source" "$@" || true
-			$UNZIP * || true
+			$UNZIPPER *.zip || true
 			cd ..
 			$MKDIR "games/$pack"
 			$MV zipdownload/*/* "games/$pack/" || true
@@ -147,14 +147,16 @@ pack()
 }
 
 mkdir -p games
-pack DarkPlacesPack  GPL         svn    https://zerowing.idsoftware.com/svn/radiant.gamepacks/DarkPlacesPack/branches/1.5/
+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 Q3Pack          proprietary svn    https://zerowing.idsoftware.com/svn/radiant.gamepacks/Q3Pack/trunk/ -r29
+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       proprietary zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/QuakePack.zip
+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    https://zerowing.idsoftware.com/svn/radiant.gamepacks/UFOAIPack/branches/1.5/
-pack WarsowPack      GPL         svn    https://svn.bountysource.com/wswpack/trunk/netradiant/games/WarsowPack/
-pack XonoticPack     GPL         git    git://git.xonotic.org/xonotic/netradiant-xonoticpack.git
+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