r7711 - in packages/trunk/game-data-packager: etc lib

[Jon Dowland]

Author: jmtd-guest
Date: 2008-07-14 20:38:59 +0000 (Mon, 14 Jul 2008)
New Revision: 7711

Added:
   packages/trunk/game-data-packager/etc/game-data-packager.conf
   packages/trunk/game-data-packager/lib/game-data-packager-shared
Removed:
   packages/trunk/game-data-packager/etc/game-package.conf
   packages/trunk/game-data-packager/lib/game-package-shared
Log:
rename game-package, part 4

Copied: packages/trunk/game-data-packager/etc/game-data-packager.conf (from rev 7708, packages/trunk/game-data-packager/etc/game-package.conf)
===================================================================
--- packages/trunk/game-data-packager/etc/game-data-packager.conf	                        (rev 0)
+++ packages/trunk/game-data-packager/etc/game-data-packager.conf	2008-07-14 20:38:59 UTC (rev 7711)
@@ -0,0 +1,5 @@
+# game-package.conf
+# arguments accept "yes" or "no"
+
+INSTALL="yes"	# install the generated package on the local system
+PRESERVE="no"	# do not preserve the generated package file(s)


Property changes on: packages/trunk/game-data-packager/etc/game-data-packager.conf
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: packages/trunk/game-data-packager/etc/game-package.conf
===================================================================
--- packages/trunk/game-data-packager/etc/game-package.conf	2008-07-14 20:38:24 UTC (rev 7710)
+++ packages/trunk/game-data-packager/etc/game-package.conf	2008-07-14 20:38:59 UTC (rev 7711)
@@ -1,5 +0,0 @@
-# game-package.conf
-# arguments accept "yes" or "no"
-
-INSTALL="yes"	# install the generated package on the local system
-PRESERVE="no"	# do not preserve the generated package file(s)

Copied: packages/trunk/game-data-packager/lib/game-data-packager-shared (from rev 7708, packages/trunk/game-data-packager/lib/game-package-shared)
===================================================================
--- packages/trunk/game-data-packager/lib/game-data-packager-shared	                        (rev 0)
+++ packages/trunk/game-data-packager/lib/game-data-packager-shared	2008-07-14 20:38:59 UTC (rev 7711)
@@ -0,0 +1,144 @@
+verify_md5sum() {
+	FILE=$1
+	GOODSUM=$2
+	SUM=`md5sum $FILE|cut -d' ' -f1`
+	if [ "$SUM" != "$GOODSUM" ]; then
+		echo "error: $FILE's md5 checksum is unknown." >&2
+		echo "perhaps it is corrupted?" >&2
+		echo "quitting." >&2
+		exit 1
+	fi
+}
+
+verify_directory() {
+	DIR=$1
+	if [ ! -d "$DIR" ]; then
+		echo "error: $DIR is not a directory. Quitting." >&2
+		exit 1
+	fi
+}
+
+verify_file() {
+	FILE=$1
+	if [ ! -f "$FILE" ]; then
+		echo "error: $FILE is not a file. Quitting." >&2
+		exit 1
+	fi
+}
+
+# TODO: rewrite for no $1/$2 case (test $#)
+die() { 
+	if [ -n "$2" ]; then RET=$2
+	else                 RET=1
+	fi
+	echo $0: $1 >&2
+	exit $RET
+}
+
+# TODO: this assumes every file is going to go in the same RELPATH. hmm.
+slipstream() {
+	DEB="$1"     # the .deb file we are going to mangle
+	RELPATH="$2" # relative path in the unpacked .deb
+	shift 2
+
+	OLDWD=`pwd`
+	cd "$WORKDIR"
+
+	slipstream_permcheck "$DEB"
+	slipstream_unpack "$DEB"
+
+	while [ "$#" -gt 0 ]; do
+		slipstream_file "$1" "$RELPATH"
+		shift
+	done
+
+	slipstream_instsize
+	slipstream_repack "$DEB"
+	slipstream_cleanup
+
+	cd "$OLDWD"
+}
+
+slipstream_permcheck() {
+	DEB="$1"
+
+	# ensure we can write to $DEB
+	if [ ! -w "$DEB" ]; then
+		ls -l "$DEB"
+		die "wrong permissions on $DEB (I can't write to it)"
+	fi
+
+	# ensure we can write to the workdir
+	if [ ! -w . ]; then
+		die "cannot write to $PWD"
+	fi
+}
+slipstream_unpack() {
+	DEB="$1"
+	dpkg-deb -e "$DEB" "./DEBIAN"
+	dpkg-deb -x "$DEB" "./slipstream.unpacked"
+}
+
+slipstream_file() {
+	FILE="$1"
+	RELPATH="$2"
+	BN=`basename "$FILE"`
+
+	cp -p "$FILE" "./slipstream.unpacked/$RELPATH/$BN"
+	chmod 644 "./slipstream.unpacked/$RELPATH/$BN"
+
+	# add a line to md5sums
+	cd slipstream.unpacked
+	md5sum "$RELPATH/$BN" >> "../DEBIAN/md5sums"
+	cd ..
+}
+
+slipstream_instsize() {
+	# figure out the new installed-size
+	INSTSIZE=`du -sk ./slipstream.unpacked | cut -f1`
+	sed -i  "s/^Installed-Size.*/Installed-Size: $INSTSIZE/" \
+		"./DEBIAN/control"
+}
+
+slipstream_repack() {
+	DEB="$1"     # the .deb file we are going to mangle
+
+	# repack
+	mv DEBIAN slipstream.unpacked
+	# XXX: capture the output of dpkg-deb and hide it
+	fakeroot dpkg-deb -b slipstream.unpacked "$DEB" | ( \
+		grep -v "^dpkg-deb: building package \`doom-wad' in \`$DEB'."\
+		|| true)
+
+}
+
+slipstream_cleanup() {
+	rm -rf ./slipstream.unpacked
+}
+
+# stuff relating to installing the generated packages ########################
+
+install_deb() {
+	DEB="$1"
+	sudo gdebi "$DEB"
+}
+
+unravel() {
+	FILE="$1"
+	if echo "$FILE" | grep ^/ >/dev/null; then
+		:
+	else
+		# assume a relative path
+		FILE="$PWD/$FILE"
+	fi
+
+	echo $FILE
+}
+
+if [ -f ./debian/changelog ]; then
+    GAME_PACKAGE_VERSION=`dpkg-parsechangelog -ldebian/changelog --format \
+        rfc822 | grep Version | cut -d' ' -f2`
+else
+    GAME_PACKAGE_VERSION=`dpkg-query --showformat='${Version}\n' \
+        --show game-package`
+fi


Property changes on: packages/trunk/game-data-packager/lib/game-data-packager-shared
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: packages/trunk/game-data-packager/lib/game-package-shared
===================================================================
--- packages/trunk/game-data-packager/lib/game-package-shared	2008-07-14 20:38:24 UTC (rev 7710)
+++ packages/trunk/game-data-packager/lib/game-package-shared	2008-07-14 20:38:59 UTC (rev 7711)
@@ -1,144 +0,0 @@
-verify_md5sum() {
-	FILE=$1
-	GOODSUM=$2
-	SUM=`md5sum $FILE|cut -d' ' -f1`
-	if [ "$SUM" != "$GOODSUM" ]; then
-		echo "error: $FILE's md5 checksum is unknown." >&2
-		echo "perhaps it is corrupted?" >&2
-		echo "quitting." >&2
-		exit 1
-	fi
-}
-
-verify_directory() {
-	DIR=$1
-	if [ ! -d "$DIR" ]; then
-		echo "error: $DIR is not a directory. Quitting." >&2
-		exit 1
-	fi
-}
-
-verify_file() {
-	FILE=$1
-	if [ ! -f "$FILE" ]; then
-		echo "error: $FILE is not a file. Quitting." >&2
-		exit 1
-	fi
-}
-
-# TODO: rewrite for no $1/$2 case (test $#)
-die() { 
-	if [ -n "$2" ]; then RET=$2
-	else                 RET=1
-	fi
-	echo $0: $1 >&2
-	exit $RET
-}
-
-# TODO: this assumes every file is going to go in the same RELPATH. hmm.
-slipstream() {
-	DEB="$1"     # the .deb file we are going to mangle
-	RELPATH="$2" # relative path in the unpacked .deb
-	shift 2
-
-	OLDWD=`pwd`
-	cd "$WORKDIR"
-
-	slipstream_permcheck "$DEB"
-	slipstream_unpack "$DEB"
-
-	while [ "$#" -gt 0 ]; do
-		slipstream_file "$1" "$RELPATH"
-		shift
-	done
-
-	slipstream_instsize
-	slipstream_repack "$DEB"
-	slipstream_cleanup
-
-	cd "$OLDWD"
-}
-
-slipstream_permcheck() {
-	DEB="$1"
-
-	# ensure we can write to $DEB
-	if [ ! -w "$DEB" ]; then
-		ls -l "$DEB"
-		die "wrong permissions on $DEB (I can't write to it)"
-	fi
-
-	# ensure we can write to the workdir
-	if [ ! -w . ]; then
-		die "cannot write to $PWD"
-	fi
-}
-slipstream_unpack() {
-	DEB="$1"
-	dpkg-deb -e "$DEB" "./DEBIAN"
-	dpkg-deb -x "$DEB" "./slipstream.unpacked"
-}
-
-slipstream_file() {
-	FILE="$1"
-	RELPATH="$2"
-	BN=`basename "$FILE"`
-
-	cp -p "$FILE" "./slipstream.unpacked/$RELPATH/$BN"
-	chmod 644 "./slipstream.unpacked/$RELPATH/$BN"
-
-	# add a line to md5sums
-	cd slipstream.unpacked
-	md5sum "$RELPATH/$BN" >> "../DEBIAN/md5sums"
-	cd ..
-}
-
-slipstream_instsize() {
-	# figure out the new installed-size
-	INSTSIZE=`du -sk ./slipstream.unpacked | cut -f1`
-	sed -i  "s/^Installed-Size.*/Installed-Size: $INSTSIZE/" \
-		"./DEBIAN/control"
-}
-
-slipstream_repack() {
-	DEB="$1"     # the .deb file we are going to mangle
-
-	# repack
-	mv DEBIAN slipstream.unpacked
-	# XXX: capture the output of dpkg-deb and hide it
-	fakeroot dpkg-deb -b slipstream.unpacked "$DEB" | ( \
-		grep -v "^dpkg-deb: building package \`doom-wad' in \`$DEB'."\
-		|| true)
-
-}
-
-slipstream_cleanup() {
-	rm -rf ./slipstream.unpacked
-}
-
-# stuff relating to installing the generated packages ########################
-
-install_deb() {
-	DEB="$1"
-	sudo gdebi "$DEB"
-}
-
-unravel() {
-	FILE="$1"
-	if echo "$FILE" | grep ^/ >/dev/null; then
-		:
-	else
-		# assume a relative path
-		FILE="$PWD/$FILE"
-	fi
-
-	echo $FILE
-}
-
-if [ -f ./debian/changelog ]; then
-    GAME_PACKAGE_VERSION=`dpkg-parsechangelog -ldebian/changelog --format \
-        rfc822 | grep Version | cut -d' ' -f2`
-else
-    GAME_PACKAGE_VERSION=`dpkg-query --showformat='${Version}\n' \
-        --show game-package`
-fi