fix compile error

[xonotic/netradiant.git] / download-gamepacks.sh

diff --git a/download-gamepacks.sh b/download-gamepacks.sh
index e15ded98167c096f64adf9c12d684223323ea7d3..7717cd2dcb961845d3c78bec9e98939f9caa8e08 100755 (executable)
--- 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,42 +112,51 @@ 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
-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    http://opensvn.csie.org/warsowgamepack/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