Merge lp:~jazzva/mozilla-devscripts/lp452422 into lp:~mozillateam/mozilla-devscripts/mozilla-devscripts

[Saša Bodiroža]

[Saša Bodiroža (jazzva)]

Fixes bug #452422.

[Alexander Sack (asac)]

loooks good from what i can tell. thanks!

wonder if we might also want to fail if there is any .jar next to the .jar! dir ... but i guess not for this bug :).

please commit to branch

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-07 16:32:40 +0000
+++ debian/changelog	2009-10-21 18:15:26 +0000
@@ -1,3 +1,13 @@
+mozilla-devscripts (0.18) UNRELEASED; urgency=low
+
+  * med-xpi-pack:
+    - Keep track of produced jar files and remove them only after the build
+      of xpi file (LP: #452422) (Closes: #551065)
+  * med-xpi-{pack,unpack}:
+    - Enclose -name parameter with single quotes in find command
+
+ -- Sasa Bodiroza <[e-mail]>  Wed, 21 Oct 2009 19:54:49 +0200
+
 mozilla-devscripts (0.17) unstable; urgency=low
 
   * xpi.mk:
 
=== modified file 'src/med-xpi-pack'
--- src/med-xpi-pack	2009-09-22 07:53:37 +0000
+++ src/med-xpi-pack	2009-10-21 18:15:26 +0000
@@ -62,8 +62,9 @@
 fi;
 
 START_DIR=`pwd`;
+PACK_JAR_PATHS="";
 cd $INDIR;
-for JAR_DIR in `find . -type d -name *.jar\!` ; do
+for JAR_DIR in `find . -type d -name '*.jar\!'` ; do
 	JAR_FILE=`echo $JAR_DIR | sed "s/jar\!$/jar/"`;
 	ABS_JAR_PATH=`cd $JAR_DIR ; pwd`;
 	ABS_JAR_FILE=`echo $ABS_JAR_PATH | sed "s/jar\!$/jar/"`;
@@ -72,6 +73,7 @@
 	echo "Packing $JAR_FILE";
 	zip -q -r $ABS_JAR_FILE .;
 	cd $ABS_CUR_DIR;
+	PACK_JAR_PATHS="$ABS_JAR_FILE $PACK_JAR_PATHS";
 	rm -rf $ABS_JAR_PATH;
 done;
 echo "Packing $XPIFILE";
@@ -79,8 +81,8 @@
 [ -f $START_DIR/$XPIFILE ] && XPIDIR=`dirname $START_DIR/$XPIFILE`
 ABS_XPIDIR=`cd $XPIDIR; pwd`;
 echo "Packed XPI file. It is located in $ABS_XPIDIR";
-for JAR_PATH in `find . -name *.jar` ; do
-        echo "Unpacking $JAR_PATH";
+for JAR_PATH in $PACK_JAR_PATHS ; do
+        echo "Unpacking and removing $JAR_PATH";
         unzip -q $JAR_PATH -d $JAR_PATH!;
         rm -f $JAR_PATH;
 done;
 
=== modified file 'src/med-xpi-unpack'
--- src/med-xpi-unpack	2009-09-22 07:53:37 +0000
+++ src/med-xpi-unpack	2009-10-21 18:15:26 +0000
@@ -66,7 +66,7 @@
 
 unzip -q $XPIFILE -d $OUTDIR;
 cd $OUTDIR;
-for JAR_PATH in `find . -name *.jar` ; do
+for JAR_PATH in `find . -name '*.jar'` ; do
 	echo "Unpacking $JAR_PATH";
 	unzip -q $JAR_PATH -d $JAR_PATH!;
 	rm -f $JAR_PATH;