[Libreoffice-commits] core.git: bin/unpack-sources

[Andrew Udvare (via logerrit)]

 bin/unpack-sources |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f3b7dc649bc384be6000d98a87763cab26fe3f32
Author: Andrew Udvare 
AuthorDate: Fri Dec 18 03:23:37 2020 -0500
Commit: Thorsten Behrens 
CommitDate: Fri Feb 26 00:33:45 2021 +0100

fix unpack-sources to not require GNU find

This makes bin/unpack-sources work on systems that do not have
GNU coreutils in PATH, such as macOS.

Change-Id: I54ed219eedf0f45c039edb6e486f3afe273dd51f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107936
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/unpack-sources b/bin/unpack-sources
index 2408eda1e14c..7221696e199f 100755
--- a/bin/unpack-sources
+++ b/bin/unpack-sources
@@ -85,7 +85,7 @@ for tarball in $tarballs ; do
 fi
 
 # create symlinks for module directories; ignore git-hooks directory
-for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d 
-path $lo_src_dir/$tarname/git-hooks -o -printf "$tarname/%f\n"` ; do
-ln -sf "src/$dir" "$start_dir"
-done
+while read -r dir; do
+ln -sf "src/${tarname}/$(basename "$dir")" "$start_dir"
+done < <(find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d -path 
$lo_src_dir/$tarname/git-hooks)
 done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/unpack-sources

[Libreoffice Gerrit user]

 bin/unpack-sources |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 885ca0f4b2def1623fb8901fa9a03e41543d5be4
Author: Andrea Gelmini 
AuthorDate: Sat Dec 22 23:20:17 2018 +
Commit: Julien Nabet 
CommitDate: Tue Dec 25 10:14:24 2018 +0100

Fix typo

Change-Id: I2bb8daba6878432c002471bdfa33652147c3b6f9
Reviewed-on: https://gerrit.libreoffice.org/65602
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/bin/unpack-sources b/bin/unpack-sources
index f7b522545ebe..2408eda1e14c 100755
--- a/bin/unpack-sources
+++ b/bin/unpack-sources
@@ -10,7 +10,7 @@
 
 usage()
 {
-echo "Helper script to unpack the LO source tarbals"
+echo "Helper script to unpack the LO source tarballs"
 echo
 echo "Usage: ${0##*/} [--help] start-dir tarball..."
 echo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/unpack-sources

[Christian Lohmaier]

 0 files changed

New commits:
commit 10f112376b5767aacef99aff239c87b17ac38d27
Author: Christian Lohmaier 
Date:   Fri Jun 17 16:27:00 2016 +0200

tdf#100453 – bin/unpack-sources needs to be executable

otherwise building from source-tarballs fails when it tries to extract
fetched submodule tarballs

Change-Id: I75bcd6821e244ca2a3375ec2916ee7c38ec9844e

diff --git a/bin/unpack-sources b/bin/unpack-sources
old mode 100644
new mode 100755
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/unpack-sources

[David Tardon]

 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

[Libreoffice-commits] core.git: bin/unpack-sources

[David Tardon]

 bin/unpack-sources |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5621aa6b5cc5151eebc8b7cc591ebd25cd23307f
Author: David Tardon dtar...@redhat.com
Date:   Fri Aug 9 11:51:58 2013 +0200

fdo#50436 fail if unpacking of tarball failed

Change-Id: Iacad0141a72a12e67e5cc33b2e2196b74a240e81

diff --git a/bin/unpack-sources b/bin/unpack-sources
index 4b0f9be..a6a14ab 100644
--- a/bin/unpack-sources
+++ b/bin/unpack-sources
@@ -75,7 +75,10 @@ for tarball in $tarballs ; do
 
 echo Unpacking $tarname...
 echo tar -xf $tarball -C $lo_src_dir
-tar -xf $tarball -C $lo_src_dir
+if ! tar -xf $tarball -C $lo_src_dir; then
+echo Error: could not unpack $tarname
+exit 1
+fi
 
 # create symlinks for module directories; ignore git-hooks directory
 for dir in `find $lo_src_dir/$tarname -mindepth 1 -maxdepth 1 -type d 
-path $lo_src_dir/$tarname/git-hooks -o -printf $tarname/%f\n` ; do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits