[quake3] - Update worldofpadman autodownloader files and wrapper script to download and play World of Padma

Wed Jan 5 08:19:03 UTC 2011

commit 8e25a4331cfbf66dab5196af18743ab1f96038b8
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Jan 5 09:25:57 2011 +0100

    - Update worldofpadman autodownloader files and wrapper script to
      download and play World of Padman version 1.5

 quake3.spec            |    8 ++++++--
 worldofpadman.autodlrc |   22 ++++++++--------------
 worldofpadman.sh       |   42 +++++++++++++++++++-----------------------
 3 files changed, 33 insertions(+), 39 deletions(-)
---

diff --git a/quake3.spec b/quake3.spec
index 45363c8..44c31f5 100644
--- a/quake3.spec
+++ b/quake3.spec
@@ -1,6 +1,6 @@
 Name:           quake3
 Version:        1.36
-Release:        8.svn1802%{?dist}
+Release:        9.svn1802%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -150,7 +150,7 @@ game in 1998. Most of the maps in the game are lilliput style.
 World of Padman uses the GPL licensed ioquake3 engine, however the Wop data-
 files are not freely redistributable. This package will install a World of
 Padman menu entry, which will automatically download the necessary datafiles
-(600 MB!) the first time you start World of Padman.
+(900 MB!) the first time you start World of Padman.
 
 
 %prep
@@ -304,6 +304,10 @@ fi
 
 
 %changelog
+* Tue Jan  4 2011 Hans de Goede <hdegoede at redhat.com> 1.36-9.svn1802
+- Update worldofpadman autodownloader files and wrapper script to
+  download and play World of Padman version 1.5
+
 * Thu Nov 11 2010 Hans de Goede <hdegoede at redhat.com> 1.36-8.svn1802
 - Update release to svn revision (r1802)
 - Add a whole bunch of patches from Debian which allow using ioquake3 as an
diff --git a/worldofpadman.autodlrc b/worldofpadman.autodlrc
index 6f23782..934f5a2 100644
--- a/worldofpadman.autodlrc
+++ b/worldofpadman.autodlrc
@@ -22,21 +22,15 @@ Click Accept, to download the The World of Padman datafiles, which can be freely
 
 [FILELIST]
 [FILE]
-	[FILENAME]worldofpadman.run[/FILENAME]
-	[MD5]c7650414d7865ddac26ada6b3f7b8cc9[/MD5]
-	[PATH]$HOME/.q3a[/PATH]
+	[FILENAME]wop-1.5-unified.zip[/FILENAME]
+	[MD5]8871affc2a36f23aa22044454c834923[/MD5]
+	[PATH]$HOME/.wop[/PATH]
 	[MIRRORS]
-		[URL]ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/worldofpadman.run[/URL]
-		[URL]http://thilo.kickchat.com/download/worldofpadman.run[/URL]
-	[/MIRRORS]
-[/FILE]
-[FILE]
-	[FILENAME]wop_patch_1_2.run[/FILENAME]
-	[MD5]3468FC91889795471BC68E35EA334614[/MD5]
-	[PATH]$HOME/.q3a[/PATH]
-	[MIRRORS]
-		[URL]ftp://ftp.kickchat.com/wop/wop_patch_1_2.run[/URL]
-		[URL]ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/wop_patch_1_2.run[/URL]
+		[URL]http://mirror.exp.de/games/WoP/wop-1.5-unified.zip[/URL]
+		[URL]http://wop.chillerlan.net/wop-1.5-unified.zip[/URL]
+		[URL]ftp://ftp.loop8.net/games/worldofpadman/wop-1.5-unified.zip[/URL]
+		[URL]http://files.cucurb.net/wop-1.5-unified.zip[/URL]
+		[URL]http://downloads.sourceforge.net/wop-engine/wop-1.5-unified.zip[/URL]
 	[/MIRRORS]
 [/FILE]
 [/FILELIST]
diff --git a/worldofpadman.sh b/worldofpadman.sh
index f9800b5..0750724 100644
--- a/worldofpadman.sh
+++ b/worldofpadman.sh
@@ -2,7 +2,17 @@
 
 set -e
 
-if [ ! -f $HOME/.q3a/wop/wop_006.pk3 ]; then
+# For wop < 1.5 lived in ~/.q3a/wop, with ~/.wop/wop being a symlink to it
+# For wop 1.5 we directly use ~/.wop/wop
+if [ -L $HOME/.wop/wop ]; then
+	rm $HOME/.wop/wop
+fi
+
+# Clean up old wop if any, note we do this undepent of the symlink existing
+# as even older autodownloader installs ran directly from ~/.q3a/wop
+rm -fr $HOME/.q3a/wop
+
+if [ ! -f $HOME/.wop/wop/wop_001.pk3 ]; then
 	set +e
 	/usr/share/autodl/AutoDL.py /usr/share/quake3/worldofpadman.autodlrc
 	STATUS=$?
@@ -10,22 +20,9 @@ if [ ! -f $HOME/.q3a/wop/wop_006.pk3 ]; then
 
 	# status 2 means download was ok, but the user choice not to start the game
 	if [ "$STATUS" = "0" -o "$STATUS" = "2" ]; then
-		mkdir -p $HOME/.q3a/wop/extras
-		pushd $HOME/.q3a/wop > /dev/null
-		
-		# install wop 1.1
-		sh ../worldofpadman.run --nox11 --noexec --target .
-		tar xf readme.tar
-		tar xf extras.tar -C extras wop_dvd_cover*
-		tar xf wop-data.tar
-		rm -r bin setup.sh setup.data *.tar ../worldofpadman.run
-
-		# install 1.2 patch
-		sh ../wop_patch_1_2.run --nox11 --noexec --target .
-		tar xf extras.tar
-		tar xf wop-data-1.2.tar
-		rm -r bin setup.sh setup.data *.tar ../wop_patch_1_2.run
-		
+		pushd $HOME/.wop > /dev/null
+		unzip wop-1.5-unified.zip
+		rm -r *.dll wop*.* "XTRAS/editing files"
 		popd > /dev/null
 	fi
 	if [ "$STATUS" != "0" ]; then
@@ -33,12 +30,8 @@ if [ ! -f $HOME/.q3a/wop/wop_006.pk3 ]; then
 	fi
 fi
 
-# We used to run from under ~/.q3a, but that is a bad idea as that will
+# We run from ~/.wop, using ~/.q3a is a bad idea as that will
 # cause com_standalone to get unset if regular quake3 is also present
-# So now we run from ~/.wop, but we keep the data files under
-# ~/.q3a for compatibilities with older autodl "installs"
-mkdir -p $HOME/.wop
-ln -f -s ../.q3a/wop $HOME/.wop/wop
 
 # we're a standalone game
 CVARS="+set com_standalone 1"
@@ -46,7 +39,10 @@ CVARS="$CVARS +set fs_basegame wop"
 CVARS="$CVARS +set fs_basepath /usr/share/wop"
 CVARS="$CVARS +set fs_homepath \"$HOME/.wop\""
 # World of Padman's default master server is different
-CVARS="$CVARS +set sv_master1 wopmaster.kickchat.com:27955"
+CVARS="$CVARS +set sv_master1 master.worldofpadman.com:27955"
+# WoP 1.5 has bumped the protocol version to allow using 1 master server
+# for 1.2 and 1.5
+CVARS="$CVARS +set protocol 69"
 # update.quake3arena.com is pretty irrelevant if you're playing wop
 CVARS="$CVARS +set cl_motd 0"
 
