bin/unpack-sources | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 0ad5604c91cdd593739b4af5dd3168d9b23b016b
Author: David Tardon <dtar...@redhat.com>
Date: Fri Oct 3 08:00:37 2014 +0200
fdo#82144 fix unpacking of additional tarballs
Change-Id: I74a61005fa9534b3f96cd392c6e38c54c5fd35e1
diff --git a/bin/unpack-sources b/bin/unpack-sources
index a6a14ab..f7b5225 100644
--- a/bin/unpack-sources
+++ b/bin/unpack-sources
@@ -52,7 +52,7 @@ if test -z "$start_dir" ; then
echo "Error: Please, define where to unpack sources, try --help"
fi
-if ! test -f $start_dir/Repository.mk -a -f $start_dir/solenv/inc/target.mk ;
then
+if ! test -f $start_dir/Repository.mk ; then
echo "Error: $start_dir is not a valid LibreOffice core source directory"
exit 1;
fi
@@ -74,8 +74,12 @@ for tarball in $tarballs ; do
fi
echo "Unpacking $tarname..."
- echo tar -xf "$tarball" -C "$lo_src_dir"
- if ! tar -xf "$tarball" -C "$lo_src_dir"; then
+ echo mkdir -p "$lo_src_dir/$tarname"
+ if ! mkdir -p "$lo_src_dir/$tarname" ; then
+ echo "Error: could not create directory $lo_src_dir/$tarname"
+ fi
+ echo tar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1
+ if ! tar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1;
then
echo "Error: could not unpack $tarname"
exit 1
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
