changeset 30117:167747278b7a

use -k option for bzip2 and gzip (bug #43206) * unpack.m: Use -k for gzip and bzip2 commands.
author John W. Eaton <jwe@octave.org>
date Thu, 02 Sep 2021 18:02:46 -0400
parents 4eddc4cba4e9
children 62af50666f62
files scripts/miscellaneous/unpack.m
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/miscellaneous/unpack.m	Thu Sep 02 17:55:44 2021 -0400
+++ b/scripts/miscellaneous/unpack.m	Thu Sep 02 18:02:46 2021 -0400
@@ -192,12 +192,12 @@
   ##    bzip2 and gzip decompress the file at its location).
   persistent commandlist;
   if (isempty (commandlist))
-    commandlist.gz = {'gzip -d -v -f -r "%s"', ...
-                      'gzip -d -f -r "%s"', ...
+    commandlist.gz = {'gzip -d -k -v -f -r "%s"', ...
+                      'gzip -d -k -f -r "%s"', ...
                       @__parse_gzip__, true};
     commandlist.z = commandlist.gz;
-    commandlist.bz2 = {'bzip2 -d -v -f "%s"', ...
-                       'bzip2 -d -f "%s"', ...
+    commandlist.bz2 = {'bzip2 -d -k -v -f "%s"', ...
+                       'bzip2 -d -k -f "%s"', ...
                        @__parse_bzip2__, true};
     commandlist.bz = commandlist.bz2;
     commandlist.tar = {'tar xvf "%s"', ...
@@ -328,7 +328,7 @@
   ## Parse the output from gzip and gunzip returning the files
   ## compressed (or decompressed).
 
-  files = regexprep (output, '^.+ -- replaced with (.*)$', '$1');
+  files = regexprep (output, '^.+ -- created (.*)$', '$1');
 endfunction
 
 function files = __parse_bzip2__ (output)