[ooo-build-commit] bin/unpack

[Tor Lillqvist]

 bin/unpack |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f7d598e3e40d63796ce38c8431e0c11cf5285afa
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 2 14:31:01 2009 +0300

    Make l10n unpacking work --without-git
    
    * bin/unpack: Copy files unpacked from the l10n tarball over using tar
      instead of moving whole directories, as some of these directories
      already have been unpacked from other tarballs.

diff --git a/bin/unpack b/bin/unpack
index 38beb0b..0501bba 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -238,8 +238,12 @@ if test "z$OOO_GIT" = "z" ; then
             echo "	moving it into place..."
 
             if test "$SOURCE_TYPE" = "CGIT" ; then
-                mv $GITTAG/* $OOBUILDDIR
-                rm -r $GITTAG
+		if test $pkg = l10n ; then
+		    (cd $GITTAG && $GNUTAR cf - .) | (cd $OOBUILDDIR && $GNUTAR xpf -)
+		else
+		    mv $GITTAG/* $OOBUILDDIR
+		fi
+		rm -r $GITTAG
             else
                 mv $OOO_SPLIT_PREFIX$pkg/* $OOBUILDDIR
                 rmdir $OOO_SPLIT_PREFIX$pkg