r6304 - in packages/trunk/game-package: . debian lib

[Jon Dowland]

Author: jmtd-guest
Date: 2008-03-25 19:58:05 +0000 (Tue, 25 Mar 2008)
New Revision: 6304

Modified:
   packages/trunk/game-package/debian/changelog
   packages/trunk/game-package/game-package
   packages/trunk/game-package/lib/game-package-shared
Log:
clean up the tempdir left behind by the slipstream code

Modified: packages/trunk/game-package/debian/changelog
===================================================================
--- packages/trunk/game-package/debian/changelog	2008-03-25 19:45:43 UTC (rev 6303)
+++ packages/trunk/game-package/debian/changelog	2008-03-25 19:58:05 UTC (rev 6304)
@@ -19,8 +19,9 @@
     into debian/rules
   * adjust priorities of official IWADs to conform to
     the doom packaging guidelines
+  * clean up the tempdir used by the slipstream functions
 
- -- Jon Dowland <jon at alcopop.org>  Tue, 25 Mar 2008 19:20:50 +0000
+ -- Jon Dowland <jon at alcopop.org>  Tue, 25 Mar 2008 19:57:39 +0000
 
 games-package (16) unstable; urgency=low
 

Modified: packages/trunk/game-package/game-package
===================================================================
--- packages/trunk/game-package/game-package	2008-03-25 19:45:43 UTC (rev 6303)
+++ packages/trunk/game-package/game-package	2008-03-25 19:58:05 UTC (rev 6304)
@@ -113,6 +113,8 @@
 	install_deb "$OUTFILE"
 fi
 
+# cleanup
 if [ "$PRESERVE" != "yes" ]; then
 	rm "$OUTFILE"
 fi
+# TODO: we're leaving working directories lying around

Modified: packages/trunk/game-package/lib/game-package-shared
===================================================================
--- packages/trunk/game-package/lib/game-package-shared	2008-03-25 19:45:43 UTC (rev 6303)
+++ packages/trunk/game-package/lib/game-package-shared	2008-03-25 19:58:05 UTC (rev 6304)
@@ -42,7 +42,7 @@
 	shift 2
 
 	WORKDIR=`mktemp -td game-package-shared.slipstream.XXXXXX`
-	debug "WORKDIR=$WORKDIR"
+	debug "slipstream WORKDIR=$WORKDIR"
 	OLDWD=`pwd`
 	cd "$WORKDIR"
 
@@ -114,6 +114,7 @@
 
 slipstream_cleanup() {
 	rm -rf ./foo
+	rmdir $PWD
 }
 
 # stuff relating to installing the generated packages ########################