r7747 - in packages/branches/game-data-packager/consolidate-doom: lib supported

[Jon Dowland]

Author: jmtd-guest
Date: 2008-07-16 16:58:10 +0000 (Wed, 16 Jul 2008)
New Revision: 7747

Modified:
   packages/branches/game-data-packager/consolidate-doom/lib/doom-common
   packages/branches/game-data-packager/consolidate-doom/supported/doom
   packages/branches/game-data-packager/consolidate-doom/supported/doom2
Log:
generalize go method

Modified: packages/branches/game-data-packager/consolidate-doom/lib/doom-common
===================================================================
--- packages/branches/game-data-packager/consolidate-doom/lib/doom-common	2008-07-16 16:55:12 UTC (rev 7746)
+++ packages/branches/game-data-packager/consolidate-doom/lib/doom-common	2008-07-16 16:58:10 UTC (rev 7747)
@@ -45,3 +45,21 @@
 	DEB="$DATADIR/$DEBBASE"
 fi
 
+go() {
+	verify_args "$@"
+	WADFILE=`unravel "$1"`
+    [ -f "$WADFILE" ] || die "ERROR: '$WADFILE' does not exist."
+	checksum "$WADFILE"
+	debug "WADFILE=$WADFILE"
+	check_for_v19
+
+	DEST=`echo $DATADIR | sed 's,^/,,'`/$SHORTNAME.wad
+
+	if [ "" = "$OUTDIR" ]; then
+		OUTFILE="$WORKDIR/out.deb"
+	else
+		OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
+	fi
+	cp -p "$DEB" "$OUTFILE"
+	slipstream "$OUTFILE" "$DEST" "$WADFILE"
+}

Modified: packages/branches/game-data-packager/consolidate-doom/supported/doom
===================================================================
--- packages/branches/game-data-packager/consolidate-doom/supported/doom	2008-07-16 16:55:12 UTC (rev 7746)
+++ packages/branches/game-data-packager/consolidate-doom/supported/doom	2008-07-16 16:58:10 UTC (rev 7747)
@@ -3,12 +3,6 @@
 SHORTNAME=doom
 LONGNAME="Doom (including Ultimate Doom)"
 
-if [ -f ./lib/game-data-packager-shared ]; then
-	. ./lib/doom-common
-else
-	. /usr/lib/game-data-packager/doom-common
-fi
-
 check_for_v19() {
 	case "$CHECKSUM" in
 		"c4fe9fd920207691a9f493668e0a2083")
@@ -26,21 +20,8 @@
 
 }
 
-go() {
-	verify_args "$@"
-	WADFILE=`unravel "$1"`
-    [ -f "$WADFILE" ] || die "ERROR: '$WADFILE' does not exist."
-	checksum "$WADFILE"
-	debug "WADFILE=$WADFILE"
-	check_for_v19
-
-	DEST=`echo $DATADIR | sed 's,^/,,'`/doom.wad
-
-	if [ "" = "$OUTDIR" ]; then
-		OUTFILE="$WORKDIR/out.deb"
-	else
-		OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
-	fi
-	cp -p "$DEB" "$OUTFILE"
-	slipstream "$OUTFILE" "$DEST" "$WADFILE"
-}
+if [ -f ./lib/game-data-packager-shared ]; then
+	. ./lib/doom-common
+else
+	. /usr/lib/game-data-packager/doom-common
+fi

Modified: packages/branches/game-data-packager/consolidate-doom/supported/doom2
===================================================================
--- packages/branches/game-data-packager/consolidate-doom/supported/doom2	2008-07-16 16:55:12 UTC (rev 7746)
+++ packages/branches/game-data-packager/consolidate-doom/supported/doom2	2008-07-16 16:58:10 UTC (rev 7747)
@@ -1,15 +1,8 @@
 #!/bin/sh
-#
 
 SHORTNAME=doom2
 LONGNAME="Doom 2"
 
-if [ -f ./lib/game-data-packager-shared ]; then
-	. ./lib/doom-common
-else
-	. /usr/lib/game-data-packager/doom-common
-fi
-
 check_for_v19() {
 	case "$CHECKSUM" in
 		"25e1459ca71d321525f84628f45ca8cd")
@@ -23,21 +16,8 @@
 
 }
 
-go() {
-	verify_args "$@"
-	WADFILE=`unravel "$1"`
-    [ -f "$WADFILE" ] || die "ERROR: '$WADFILE' does not exist."
-	checksum "$WADFILE"
-	debug "WADFILE=$WADFILE"
-	check_for_v19
-
-	DEST=`echo $DATADIR | sed 's,^/,,'`/doom2.wad
-
-	if [ "" = "$OUTDIR" ]; then
-		OUTFILE="$WORKDIR/out.deb"
-	else
-		OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
-	fi
-	cp -p "$DEB" "$OUTFILE"
-	slipstream "$OUTFILE" "$DEST" "$WADFILE"
-}
+if [ -f ./lib/game-data-packager-shared ]; then
+	. ./lib/doom-common
+else
+	. /usr/lib/game-data-packager/doom-common
+fi