r5390 - packages/trunk/warsow-data/debian

Andres Mejia ceros-guest at alioth.debian.org
Wed Jan 16 00:31:11 UTC 2008


Author: ceros-guest
Date: 2008-01-16 00:31:11 +0000 (Wed, 16 Jan 2008)
New Revision: 5390

Added:
   packages/trunk/warsow-data/debian/watch
Modified:
   packages/trunk/warsow-data/debian/changelog
   packages/trunk/warsow-data/debian/warsow-data-get-orig-source
Log:
Modified script to make it more maintainable. Add watchfile.

Modified: packages/trunk/warsow-data/debian/changelog
===================================================================
--- packages/trunk/warsow-data/debian/changelog	2008-01-15 23:46:59 UTC (rev 5389)
+++ packages/trunk/warsow-data/debian/changelog	2008-01-16 00:31:11 UTC (rev 5390)
@@ -2,6 +2,7 @@
 
   [ Andres Mejia ]
   * Renamed warsow-data-tarball.sh to warsow-data-get-orig-source.
+    + Modified it to make it more maintainable.
   * Edited README.Debian.
   * Bumped Standards-Version to 3.7.3.
   * Removed Homepage from package description.
@@ -14,6 +15,7 @@
     + Including binary-arch target to comply with Debian policy.
     + Excluding upstream license.txt and gnu.txt from packaging.
     + Install upstream changelog.txt as as upstream changelog.
+  * Add watchfile.
 
  -- Andres Mejia <mcitadel at gmail.com>  Tue, 15 Jan 2008 17:50:03 -0500
 

Modified: packages/trunk/warsow-data/debian/warsow-data-get-orig-source
===================================================================
--- packages/trunk/warsow-data/debian/warsow-data-get-orig-source	2008-01-15 23:46:59 UTC (rev 5389)
+++ packages/trunk/warsow-data/debian/warsow-data-get-orig-source	2008-01-16 00:31:11 UTC (rev 5390)
@@ -3,51 +3,103 @@
 # This script will download the upstream tarball that contains the content of
 # the warsow-data package and create an orig tarball of it.
 
-if [ ! -f warsow_0.32_linux.tar.gz ] ; then
-# Download the tarball
-wget -c http://www.warsow.net/release/warsow_0.32_linux.tar.gz
+WARSOW_DATA_TARBALL="warsow_0.32_linux.tar.gz"
+WARSOW_DATA_VERSION="0.32"
+CORRECT_CHECKSUM="508fa64b6157b3f5ebed09e9e715ec43"
+
+USAGE="\
+warsow-data orig tarball download script\n\
+This script will generate an orig tarball that's distributed through Debian.\n\
+Usage: warsow-data-get-orig-source [OPTION]\n\
+\n\
+ -h, --help                 Display this text\n\
+--keep-upstream             Don't delete the upstream source tarball\n\
+--keep-orig-dir             Don't delete the orig directory\n"
+
+while [ "$#" -gt "0" ]
+do
+    case "$1" in
+        -h|--help)
+            echo -e "${USAGE}"
+            exit 1
+            ;;
+        --keep-upstream-tarball)
+            KEEP_UPSTREAM_TARBALL=1
+            shift
+            ;;
+        --keep-orig-dir)
+            KEEP_ORIG_DIR=1
+            shift
+            ;;
+    esac
+done
+
+# List of mirrors to use
+MIRROR1=http://qc-net.com/wsw
+MIRROR2=http://warsow.as-mirror.net
+MIRROR3=http://dl.warsow.us
+
+if [ ! -f $WARSOW_DATA_TARBALL ] ; then
+    # Try each mirror until sucessful, else exit with an error
+    wget -c $MIRROR1/$WARSOW_DATA_TARBALL || \
+    wget -c $MIRROR2/$WARSOW_DATA_TARBALL || \
+    wget -c $MIRROR3/$WARSOW_DATA_TARBALL || \
+    { echo "Could not download upstream source" ; exit 1 ; }
 fi
 
 # Verify the checksum
-CORRECT_CHECKSUM=508fa64b6157b3f5ebed09e9e715ec43
-COMPUTED_CHECKSUM=`md5sum warsow_0.32_linux.tar.gz | cut -d ' ' -f 1`
+echo -n "Verifying MD5 checksum..."
+COMPUTED_CHECKSUM=`md5sum $WARSOW_DATA_TARBALL | cut -d ' ' -f 1`
+echo "done."
 
 if [ $CORRECT_CHECKSUM != $COMPUTED_CHECKSUM ] ; then
 	echo "Checksum verification failed. Checksum was $COMPUTED_CHECKSUM
 Expected checksum $CORRECT_CHECKSUM"
-	exit 0
+	exit 1
 else
 	echo "Checksum verified. Checksum is $COMPUTED_CHECKSUM."
 fi
 
 # Prepare the warsow-data orig tarball
 if [ ! -d warsow ]; then
-	echo "Extracting warsow_0.32_linux.tar.gz"
-	tar -xzf warsow_0.32_linux.tar.gz
+	echo "Extracting $WARSOW_DATA_TARBALL."
+	tar -xzf $WARSOW_DATA_TARBALL
 else
 	echo "Already found extracted warsow directory. Please remove 
-or move warsow and warsow-data-0.32 directories and also warsow-data-0.32.orig."
-	exit 0
+or move warsow and warsow-data-$WARSOW_DATA_VERSION directories and also warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz."
+	exit 1
 fi
-if [ ! -d warsow-data-0.32 ]; then
-	echo "Renaming extracted warsow directory to warsow-data-0.32"
-	mv warsow warsow-data-0.32
+if [ ! -d warsow-data-$WARSOW_DATA_VERSION ]; then
+	echo "Renaming extracted warsow directory to warsow-data-$WARSOW_DATA_VERSION."
+	mv warsow warsow-data-$WARSOW_DATA_VERSION
 else
-	echo "Already found extracted warsow-data-0.32 directory. Please remove 
-or move warsow and warsow-data-0.32 directories and also warsow-data-0.32.orig."
-	exit 0
+	echo "Already found extracted warsow-data-$WARSOW_DATA_VERSION directory. Please remove 
+or move warsow and warsow-data-$WARSOW_DATA_VERSION directories and also warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz."
+	exit 1
 fi
 
-rm warsow-data-0.32/libs/*
-rm warsow-data-0.32/warsow.i386 warsow-data-0.32/warsow.x86_64
-rm warsow-data-0.32/wsw_server.i386 warsow-data-0.32/wsw_server.x86_64
+# Remove upstream binaries.
+rm warsow-data-$WARSOW_DATA_VERSION/libs/*
+rm warsow-data-$WARSOW_DATA_VERSION/warsow.i386 warsow-data-$WARSOW_DATA_VERSION/warsow.x86_64
+rm warsow-data-$WARSOW_DATA_VERSION/wsw_server.i386 warsow-data-$WARSOW_DATA_VERSION/wsw_server.x86_64
 
-# Create the tarball and exclude the CVS directories
-if [ ! -f warsow-data_0.32.orig.tar.gz ]; then
-	echo "Creating orig tarball."
-	tar -czf warsow-data_0.32.orig.tar.gz warsow-data-0.32/
+# Create the tarball
+if [ ! -f warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz ]; then
+	echo -n "Creating orig tarball..."
+	tar -czf warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz warsow-data-$WARSOW_DATA_VERSION/
+	echo "done."
+	if [ -z "$KEEP_ORIG_DIR" ]; then
+		echo -n "Removing orig directory..."
+		rm -rf warsow-data-$WARSOW_DATA_VERSION
+		echo "done."
+	fi
+	if [ -z "$KEEP_UPSTREAM_TARBALL" ]; then
+		echo -n "Removing upstream tarball..."
+		rm -f $WARSOW_DATA_TARBALL
+		echo "done."
+	fi
 else
-	echo "Already found extracted warsow-data_0.32.orig.tar.gz. Please remove 
-or move warsow and warsow-data-0.32 directories and also warsow-data-0.32.orig."
-	exit 0
+	echo "Already found extracted warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz. Please remove 
+or move warsow and warsow-data-$WARSOW_DATA_VERSION directories and also warsow-data_$WARSOW_DATA_VERSION.orig.tar.gz."
+	exit 1
 fi

Added: packages/trunk/warsow-data/debian/watch
===================================================================
--- packages/trunk/warsow-data/debian/watch	                        (rev 0)
+++ packages/trunk/warsow-data/debian/watch	2008-01-16 00:31:11 UTC (rev 5390)
@@ -0,0 +1,12 @@
+version=3
+
+# A list of mirrors used by the warsow-data-get-orig-source script.
+
+http://qc-net.com/wsw/warsow_(.*)_linux.tar.gz \
+    0.32
+
+http://warsow.as-mirror.net/warsow_(.*)_linux.tar.gz \
+    0.32
+
+http://dl.warsow.us/warsow_(.*)_linux.tar.gz \
+    0.32




More information about the Pkg-games-commits mailing list