[ooo-build-commit] 2 commits - bin/install-artwork extensions/tweakconfig

[Thorsten Behrens]

 bin/install-artwork                |   16 ++++++++++------
 extensions/tweakconfig/Makefile.am |    2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 262fbb6c7c98e043622dc67eea4b181115e92445
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Sep 3 14:18:34 2009 +0200

    Swapped non-posix sed arg for awk
    
    * extensions/tweakconfig/Makefile.am: sed line blew on mac, replaced
      by a posix-conformant awk call now
    (cherry picked from commit 55f47760d23b4984d0c7630dabe52bdecfb37533)

diff --git a/extensions/tweakconfig/Makefile.am b/extensions/tweakconfig/Makefile.am
index dd9286c..4579d53 100644
--- a/extensions/tweakconfig/Makefile.am
+++ b/extensions/tweakconfig/Makefile.am
@@ -4,7 +4,7 @@ tweakconfig : $(BUILDDIR)/bin/tweakconfig.oxt
 
 $(BUILDDIR)/bin/tweakconfig.oxt: *.xcu *.xml
 	mkdir -p $(BUILDDIR)/bin/tweakconfig && cp -r $(srcdir)/*.xcu $(srcdir)/*.xml META-INF $(BUILDDIR)/bin/tweakconfig/
-	sed -i '/WritePath/ a <value>file://$(top_srcdir)/test</value>' $(BUILDDIR)/bin/tweakconfig/Paths.xcu
+	awk '{print} /WritePath/ {print "<value>file://$(top_srcdir)/test</value>" }' $(srcdir)/Paths.xcu > $(BUILDDIR)/bin/tweakconfig/Paths.xcu
 	cd $(BUILDDIR)/bin/tweakconfig/ && zip -r $@ .
 
 all: tweakconfig
commit 69dffad0688fe7db9fad81193c679135077c5918
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Sep 2 20:45:28 2009 +0200

    Be posix-compatible in install-artwork
    
    * bin/install-artwork: changed find cmd to use only commonly-
      available options; made whole img copy sequence fail in all
      cases now.
    (cherry picked from commit 6f4951f499f3ac990060d40a5ab07fa9f612657a)

diff --git a/bin/install-artwork b/bin/install-artwork
index c82b265..d5ab3c5 100755
--- a/bin/install-artwork
+++ b/bin/install-artwork
@@ -61,12 +61,16 @@ if test -d $dest/default_images; then
 
 	# Copy extra ooo-build specific images into build.  All files under default_images 
 	# are copied into the build recursively.
-	for img in `find $src/default_images -type f -printf "default_images/%P\n"`; do
-	    # TODO: maybe we should check if the file is really an image file ?
-	    imgdir=`dirname $img` || exit 1
-	    mkdir -p $dest/$imgdir || exit 1
-	    cp -f $src/$img $dest/$img || exit 1
-	done
+    pushd $src && {
+	    for img in `find default_images -type f`; do
+            test $? -eq 0 || exit 1
+	        # TODO: maybe we should check if the file is really an image file ?
+	        imgdir=`dirname $img` || exit 1
+	        mkdir -p $dest/$imgdir || exit 1
+	        cp -f $img $dest/$img || exit 1
+	    done
+    }
+    popd
 else
 	echo "	skipping default_images"
 fi