Author: jmtd-guest
Date: 2008-03-16 19:32:25 +0000 (Sun, 16 Mar 2008)
New Revision: 6110
Modified:
packages/trunk/game-package/etc/game-package.conf
packages/trunk/game-package/game-package
packages/trunk/game-package/supported/doom
packages/trunk/game-package/supported/doom2
Log:
replace -f (output to file) with -d (output debs to dir)
Modified: packages/trunk/game-package/etc/game-package.conf
===================================================================
--- packages/trunk/game-package/etc/game-package.conf 2008-03-16 14:11:30 UTC (rev 6109)
+++ packages/trunk/game-package/etc/game-package.conf 2008-03-16 19:32:25 UTC (rev 6110)
@@ -2,4 +2,4 @@
# arguments accept "yes" or "no"
INSTALL="yes" # install the generated package on the local system
-PRESERVE="no" # do not preserve the generated package file
+PRESERVE="no" # do not preserve the generated package file(s)
Modified: packages/trunk/game-package/game-package
===================================================================
--- packages/trunk/game-package/game-package 2008-03-16 14:11:30 UTC (rev 6109)
+++ packages/trunk/game-package/game-package 2008-03-16 19:32:25 UTC (rev 6110)
@@ -28,8 +28,7 @@
echo "game-package arguments:"
echo " -n not do not install the generated package"\
"(implies -p)"
- echo " -f outfile write the generated .deb to OUTFILE and"\
- "do not delete it"
+ echo " -d OUTDIR write the generated .debs to OUTDIR"
}
usage() {
@@ -61,7 +60,7 @@
else
source "/etc/game-package.conf"
fi
-OUTFILE=""
+OUTDIR=""
# process command line arguments
while [ $# -gt 1 ]; do
@@ -70,15 +69,15 @@
INSTALL="no"
PRESERVE="yes"
;;
- '-f')
+ '-d')
PRESERVE="yes"
shift
if [ $# -lt 2 ]; then
- echo "missing filename or game argument" >&2
+ echo "missing directory or game argument" >&2
usage >&2
exit 1
fi
- OUTFILE="$1"
+ OUTDIR="$1"
;;
'--')
break;
@@ -108,6 +107,8 @@
shift
go $*
+# TODO: OUTFILE not referenced before here in this file; we're
+# assuming "go" will have defined it.
if [ "$INSTALL" = "yes" ]; then
install_deb "$OUTFILE"
fi
Modified: packages/trunk/game-package/supported/doom
===================================================================
--- packages/trunk/game-package/supported/doom 2008-03-16 14:11:30 UTC (rev 6109)
+++ packages/trunk/game-package/supported/doom 2008-03-16 19:32:25 UTC (rev 6110)
@@ -56,10 +56,10 @@
DEST=`echo $DATADIR | sed 's,^/,,'`
- if [ "" = "$OUTFILE" ]; then
+ if [ "" = "$OUTDIR" ]; then
OUTFILE=`mktemp -t game-package.doom.XXXXXX`
else
- OUTFILE=`unravel "$OUTFILE"`
+ OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
fi
cp -p "$DEB" "$OUTFILE"
slipstream "$OUTFILE" "$DEST" "$WADFILE"
Modified: packages/trunk/game-package/supported/doom2
===================================================================
--- packages/trunk/game-package/supported/doom2 2008-03-16 14:11:30 UTC (rev 6109)
+++ packages/trunk/game-package/supported/doom2 2008-03-16 19:32:25 UTC (rev 6110)
@@ -54,10 +54,10 @@
DEST=`echo $DATADIR | sed 's,^/,,'`
- if [ "" = "$OUTFILE" ]; then
+ if [ "" = "$OUTDIR" ]; then
OUTFILE=`mktemp -t game-package.doom2.XXXXXX`
else
- OUTFILE=`unravel "$OUTFILE"`
+ OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
fi
cp -p "$DEB" "$OUTFILE"
slipstream "$OUTFILE" "$DEST" "$WADFILE"