[Libreoffice-commits] .: Branch 'libreoffice-3-3' - bin/setup.in bin/unpack

Robert Nagy rnagy at kemper.freedesktop.org
Mon Nov 8 03:02:04 PST 2010


 bin/setup.in |    2 +-
 bin/unpack   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 36c34e1760ec6a93990f92084efa8565015dc3df
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 00:19:09 2010 +0100

    gunzip will always decompress, there's no need for gunzip -d

diff --git a/bin/setup.in b/bin/setup.in
index 6133d77..a802598 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -284,7 +284,7 @@ export SUSE_ASNEEDED=0
 OOO_SCALED_ICONS_VER=ooo-scaled-icons
 OOO_SCALED_ICONS_TARBALL=$OOO_SCALED_ICONS_VER.tar.gz
 OOO_SCALED_ICONS_UNTAR_OPTIONS=xzf
-OOO_SCALED_ICONS_DECOMPRESS_CMD="gunzip -dc"
+OOO_SCALED_ICONS_DECOMPRESS_CMD="gunzip -c"
 
 #
 # up-stream changed the split and names at random
diff --git a/bin/unpack b/bin/unpack
index 221ffba..135a33a 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -638,7 +638,7 @@ fi
 
 if test -f $SRCDIR/$APACHE_ANT_TARBALL; then
     $echo_n "Extracting ant $echo_c"
-    (gunzip -dc $SRCDIR/$APACHE_ANT_TARBALL | $GNUTAR xf - )|| exit 1;
+    (gunzip -c $SRCDIR/$APACHE_ANT_TARBALL | $GNUTAR xf - )|| exit 1;
     echo "done";
 else
     echo "Don't need to unpack ant";


More information about the Libreoffice-commits mailing list