diff options
| author | jan Iversen <jani@documentfoundation.org> | 2016-10-22 17:52:54 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-01-17 20:04:24 +0100 |
| commit | a031981fbc593edba649ac0f33a5d8feb82d1ede (patch) | |
| tree | 5adb3460fcdcbae0947d7871bb09859105b0c6cd /bin | |
| parent | 7deb0227ad0556e2c40231f26b637272e84f5d7e (diff) | |
update lo-pack-sources
os-x has a problem with progress bar on tar
Also remade to sed expression to a simpler one that osx understands.
change
change
Change-Id: If09573760a4bedfa285519241582bbd639a4e976
Reviewed-on: https://gerrit.libreoffice.org/30043
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
(cherry picked from commit d2e9d3d0ed42f0fc24255c64546d8d256ca33aae)
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lo-pack-sources | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources index fdaf6da6cb62..87e36501fd43 100755 --- a/bin/lo-pack-sources +++ b/bin/lo-pack-sources @@ -85,7 +85,7 @@ sub copy_dir_filter_and_show_progress($$) # copy sources from git and show progress system ("cd $source_dir && " . "git archive --format=tar HEAD | " . - " tar -xf - -C $target_dir --checkpoint=500 --checkpoint-action=exec=\"echo -n .\"") && + " tar -xf - -C $target_dir ") && die "Error: copying failed: $!\n"; print "\n"; } @@ -125,10 +125,9 @@ sub generate_lo_module_changelog($$$) my $log_name = "ChangeLog"; $log_name .= "-$module_dirname{$module}" if ($module_dirname{$module}); print "Generating changelog for $module...\n"; -# print "1:$lo_module_clone, 2:$lo_module_release_dir, 3:$module\n"; system ("cd $source_dir/$module_dirname{$module} && " . "git log --date=short --pretty='format:@%cd %an <%ae> [%H]%n%n%s%n%n%e%b' | " . - " sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||' >$lo_module_release_topdir/$log_name" ) && + " sed -e 's/^/\t/' -e 's/^\t@//' >$lo_module_release_topdir/$log_name" ) && die "Error: generating failed: $!\n"; } @@ -160,7 +159,7 @@ sub generate_tarball($$$) print "Creating $tarball..."; # generate the tarball in the current directory; avoid "./" prefix in the stored paths; show progress - system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 --checkpoint-action=exec=\"echo -n .\" $lo_topdir_name") && + system ("tar -c $tar_compress_option -f $tarball -C $dir $lo_topdir_name") && die "Error: releasing failed: $!\n"; print "\n"; } |