r883 - scripts/trunk

[Bruno Fuddl-guestquot; Fuddl" Kleinert]

Author: fuddl-guest
Date: 2006-06-21 14:28:03 +0000 (Wed, 21 Jun 2006)
New Revision: 883

Modified:
   scripts/trunk/nexuiz-prepare.sh
Log:
nexuiz-prepare packs qcsrc into -data package (makes more sense in the -data package)


Modified: scripts/trunk/nexuiz-prepare.sh
===================================================================
--- scripts/trunk/nexuiz-prepare.sh	2006-06-21 14:11:53 UTC (rev 882)
+++ scripts/trunk/nexuiz-prepare.sh	2006-06-21 14:28:03 UTC (rev 883)
@@ -3,6 +3,7 @@
 VERSION=2.0
 ARCHIVE=nexuiz-20.zip
 ENGINEZIP=enginesource20060614.zip
+GAMESRCZIP=gamesource20060614.zip
 
 if [ $# != 1 ]; then
 	echo "Usage: nexuiz-prepare.sh /path/to/nexuiz-20.zip"
@@ -19,12 +20,6 @@
 	exit 3
 fi
 
-# concerns dl'ing hotfix
-if [ ! -f /usr/bin/wget ]; then
-	echo "Please aptitude install wget"
-	exit 4
-fi
-
 if [ ! -f $1/$ARCHIVE ]; then
 	echo "Couldn't find $ARCHIVE in path $1"
 	exit 127
@@ -41,18 +36,14 @@
 
 echo "Creating engine tarball..."
 cd ./nexuiz-tmp/Nexuiz && unzip sources/$ENGINEZIP && \
-	mkdir -p nexuiz-$VERSION && mv darkplaces Docs nexuiz-$VERSION &&
+	mkdir -p nexuiz-$VERSION && mv darkplaces Docs nexuiz-$VERSION && \
 	tar --exclude .cvsignore --exclude CVS --exclude .#* -czf ../../nexuiz_$VERSION.orig.tar.gz nexuiz-$VERSION
 
 cd ../..
 
 echo "Creating data tarball..."
-cd ./nexuiz-tmp/Nexuiz && \
-	mkdir -p nexuiz-data-$VERSION && mv data nexuiz-data-$VERSION && \
-	# get upstream hotfix
-	cd nexuiz-data-$VERSION/data && wget http://kadaverjack.planetnexuiz.de/downloads/data20060616_hotfix.pk3 && \
-	cd ../.. && \
-	# end hotfix
+cd ./nexuiz-tmp/Nexuiz && unzip sources/$GAMESRCZIP && \
+	mkdir -p nexuiz-data-$VERSION && mv qcsrc data nexuiz-data-$VERSION && \
 	tar --exclude .cvsignore --exclude CVS --exclude .#* -czf ../../nexuiz-data_$VERSION.orig.tar.gz nexuiz-data-$VERSION
 
 if [ "$?" != "0" ]; then