X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=download-gamepacks.sh;h=2d6c1b7890e9047a8a46e35910e5303ed1519b3a;hp=e15ded98167c096f64adf9c12d684223323ea7d3;hb=96854914dc8ee895407d368621c157ca8156e2f8;hpb=eeda7cae23c6fd49017c9f94d64807d01c69a748

diff --git a/download-gamepacks.sh b/download-gamepacks.sh
index e15ded98..2d6c1b78 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
 
@@ -35,29 +35,29 @@ pack()
 		$ECHO "Updating $pack..."
 		case "$sourcetype" in
 			svn)
-				$SVN update "games/$pack" "$@"
+				$SVN update "games/$pack" "$@" || true
 				;;
 			zip1)
 				$RM_R zipdownload
 				$MKDIR zipdownload
 				cd zipdownload
-				$WGET "$source" "$@"
-				$UNZIP *
+				$WGET "$source" "$@" || true
+				$UNZIPPER *.zip || true
 				cd ..
 				$RM_R "games/$pack"
 				$MKDIR "games/$pack"
-				$MV zipdownload/*/* "games/$pack/"
+				$MV zipdownload/*/* "games/$pack/" || true
 				$RM_R zipdownload
 				;;
 			gitdir)
 				$RM_R "games/$pack"
 				cd games
-				$GIT archive --remote="$source" --prefix="$pack/" "$2":"$1" | tar xvf -
+				$GIT archive --remote="$source" --prefix="$pack/" "$2":"$1" | tar xvf - || true
 				cd ..
 				;;
 			git)
 				cd "games/$pack"
-				$GIT pull
+				$GIT pull || true
 				cd ../..
 				;;
 		esac
@@ -112,31 +112,38 @@ pack()
 	$ECHO "Downloading $pack..."
 	case "$sourcetype" in
 		svn)
-			$SVN checkout "$source" "games/$pack" "$@"
+			$SVN checkout "$source" "games/$pack" "$@" || true
 			;;
 		zip1)
 			$RM_R zipdownload
 			$MKDIR zipdownload
 			cd zipdownload
-			$WGET "$source" "$@"
-			$UNZIP *
+			$WGET "$source" "$@" || true
+			$UNZIPPER *.zip || true
 			cd ..
 			$MKDIR "games/$pack"
-			$MV zipdownload/*/* "games/$pack/"
+			$MV zipdownload/*/* "games/$pack/" || true
 			$RM_R zipdownload
 			;;
 		gitdir)
 			cd games
-			$GIT archive --remote="$source" --prefix="$pack/" "$2":"$1" | tar xvf -
+			$GIT archive --remote="$source" --prefix="$pack/" "$2":"$1" | tar xvf - || true
 			cd ..
 			;;
 		git)
 			cd games
-			$GIT clone "$source" "$pack"
+			$GIT clone "$source" "$pack" || true
 			cd ..
 			;;
 	esac
 	extra_urls "games/$pack"
+	good=false
+	for D in "games/$pack"/*.game; do
+		if [ -d "$D" ]; then
+			good=true
+		fi
+	done
+	$good || rm -rf "$D"
 }
 
 mkdir -p games
@@ -149,5 +156,5 @@ pack Quake2WorldPack GPL         svn    svn://jdolan.dyndns.org/quake2world/trun
 pack QuakePack       proprietary zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/QuakePack.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    http://opensvn.csie.org/warsowgamepack/netradiant/games/WarsowPack/
+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