[SCM] Installer for game data files branch, rott, updated. dcfa52fa9a59258e0b3152c8850168dd8fdcde42

[Jon Dowland]

The following commit has been merged in the rott branch:
commit dcfa52fa9a59258e0b3152c8850168dd8fdcde42
Author: Jon Dowland <jmtd at debian.org>
Date:   Thu Mar 25 14:30:44 2010 +0000

    remove unnecessary check against OUTDIR

diff --git a/lib/doom-common b/lib/doom-common
index 889aeb6..2a5520f 100644
--- a/lib/doom-common
+++ b/lib/doom-common
@@ -31,15 +31,7 @@ go() {
 
 	DEST=`echo $WADDIR | sed 's,^/,,'`/$SHORTNAME.wad
 
-	# can OUTDIR ever be ''? there should be a 'is OUTDIR writeable' test that
-	# aborts before this point. Left this in for now in case we introduce a path
-	# that can reach here when we add support for installing an on-the-fly deb and
-	# not saving a copy
-	if [ "" = "$OUTDIR" ]; then
-		OUTFILE="$WORKDIR/$DEBBASE"
-	else
-		OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
-	fi
+	OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
 	cp -p "$DEB" "$OUTFILE"
 	slipstream "$OUTFILE" "$DEST" "$WADFILE"
 }
diff --git a/supported/rott b/supported/rott
index 7b0ac0c..b191845 100644
--- a/supported/rott
+++ b/supported/rott
@@ -76,16 +76,7 @@ go() {
 		echo "warning: checksum is not what we expected" >&2
 	fi
 
-	# XXX: this para copied from lib/doom-common. Should be generalised.
-	# can OUTDIR ever be ''? there should be a 'is OUTDIR writeable' test that
-	# aborts before this point. Left this in for now in case we introduce a path
-	# that can reach here when we add support for installing an on-the-fly deb and
-	# not saving a copy
-	if [ "" = "$OUTDIR" ]; then
-		OUTFILE="$WORKDIR/$DEBBASE"
-	else
-		OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
-	fi
+    OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
 	cp -p "$DEB" "$OUTFILE"
 
 	oldpwd=`pwd`

-- 
Installer for game data files