r7731 - in packages/trunk/game-data-packager: . lib

[Jon Dowland]

Author: jmtd-guest
Date: 2008-07-16 13:55:11 +0000 (Wed, 16 Jul 2008)
New Revision: 7731

Modified:
   packages/trunk/game-data-packager/game-data-packager
   packages/trunk/game-data-packager/lib/game-data-packager-shared
Log:
move functions out of main program into library

Modified: packages/trunk/game-data-packager/game-data-packager
===================================================================
--- packages/trunk/game-data-packager/game-data-packager	2008-07-16 13:53:12 UTC (rev 7730)
+++ packages/trunk/game-data-packager/game-data-packager	2008-07-16 13:55:11 UTC (rev 7731)
@@ -14,50 +14,6 @@
 	. /usr/lib/game-data-packager/game-data-packager-shared
 fi
 
-supported() {
-	echo "the following games are supported:"
-	echo
-	printf "\tname\tdescription\n"
-	printf "\t----\t-----------\n"
-
-	find $SUPPORTED -type f | grep -v '\.svn' | grep -v 'swp$' | sort |
-	while read file; do
-		. $file
-		printf "\t%s\t%s\n" "$SHORTNAME" "$LONGNAME"
-	done
-}
-options() {
-	echo "game-data-packager arguments:"
-	echo "        -n            not do not install the generated package (requires -d)"
-	echo "        -d OUTDIR     write the generated .deb(s) to OUTDIR"
-}
-
-usage() {
-	echo "usage:"
-	printf "\tgame-data-packager [game-data-packager-args] game [game-args]\n"
-	echo
-	options
-	echo
-	supported
-	echo
-	echo "run game-data-packager [game] to see game-specific arguments."
-	echo
-}
-
-set +u
-if [ -n "$DEBUG" ]; then
-debug() {
-		echo "DEBUG: $*" >&2
-}
-else
-debug() { :; }
-fi
-set -u
-
-warn() {
-	echo "WARNING: $*" >&2
-}
-
 if [ $# -lt 1 ]; then
 	usage >&2
 	exit 1

Modified: packages/trunk/game-data-packager/lib/game-data-packager-shared
===================================================================
--- packages/trunk/game-data-packager/lib/game-data-packager-shared	2008-07-16 13:53:12 UTC (rev 7730)
+++ packages/trunk/game-data-packager/lib/game-data-packager-shared	2008-07-16 13:55:11 UTC (rev 7731)
@@ -1,3 +1,47 @@
+supported() {
+	echo "the following games are supported:"
+	echo
+	printf "\tname\tdescription\n"
+	printf "\t----\t-----------\n"
+
+	find $SUPPORTED -type f | grep -v '\.svn' | grep -v 'swp$' | sort |
+	while read file; do
+		. $file
+		printf "\t%s\t%s\n" "$SHORTNAME" "$LONGNAME"
+	done
+}
+options() {
+	echo "game-data-packager arguments:"
+	echo "        -n            not do not install the generated package (requires -d)"
+	echo "        -d OUTDIR     write the generated .deb(s) to OUTDIR"
+}
+
+usage() {
+	echo "usage:"
+	printf "\tgame-data-packager [game-data-packager-args] game [game-args]\n"
+	echo
+	options
+	echo
+	supported
+	echo
+	echo "run game-data-packager [game] to see game-specific arguments."
+	echo
+}
+
+set +u
+if [ -n "$DEBUG" ]; then
+debug() {
+		echo "DEBUG: $*" >&2
+}
+else
+debug() { :; }
+fi
+set -u
+
+warn() {
+	echo "WARNING: $*" >&2
+}
+
 verify_md5sum() {
 	FILE=$1
 	GOODSUM=$2