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

[Jon Dowland]

Author: jmtd-guest
Date: 2008-07-16 16:50:41 +0000 (Wed, 16 Jul 2008)
New Revision: 7744

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:
generalise DEBBASE

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:48:29 UTC (rev 7743)
+++ packages/branches/game-data-packager/consolidate-doom/lib/doom-common	2008-07-16 16:50:41 UTC (rev 7744)
@@ -1,5 +1,7 @@
-# vim: set ft=sh:
+#!/bin/sh
 
+DEBBASE="${SHORTNAME}-wad_${GAME_PACKAGE_VERSION}_all.deb"
+
 verify_args() {
 	if [ $# -ne 1 ]; then
 		echo "error: no wadfile specified" >&2

Modified: packages/branches/game-data-packager/consolidate-doom/supported/doom
===================================================================
--- packages/branches/game-data-packager/consolidate-doom/supported/doom	2008-07-16 16:48:29 UTC (rev 7743)
+++ packages/branches/game-data-packager/consolidate-doom/supported/doom	2008-07-16 16:50:41 UTC (rev 7744)
@@ -1,16 +1,14 @@
 #!/bin/sh
 
+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
 
-SHORTNAME=doom
-LONGNAME="Doom (including Ultimate Doom)"
-
-DEBBASE="doom-wad_${GAME_PACKAGE_VERSION}_all.deb"
-
 doom_usage() {
 	echo "doom game arguments:"  >&2
 	printf "\twadfile - path to a doom.wad\n"

Modified: packages/branches/game-data-packager/consolidate-doom/supported/doom2
===================================================================
--- packages/branches/game-data-packager/consolidate-doom/supported/doom2	2008-07-16 16:48:29 UTC (rev 7743)
+++ packages/branches/game-data-packager/consolidate-doom/supported/doom2	2008-07-16 16:50:41 UTC (rev 7744)
@@ -1,16 +1,15 @@
 #!/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
 
-SHORTNAME=doom2
-LONGNAME="Doom 2"
-
-DEBBASE="doom2-wad_${GAME_PACKAGE_VERSION}_all.deb"
-
 doom2_usage() {
 	echo "doom2 game arguments:"  >&2
 	printf "\twadfile - path to a doom2.wad\n"