summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane MOTTELET <stephane.mottelet@utc.fr>2019-11-05 11:57:55 +0100
committerClément DAVID <clement.david@esi-group.com>2019-11-19 17:16:01 +0100
commitfe0e4c2d54b392756a6012bff5443d68ee502290 (patch)
treeb6bb05eadd8a7b89077700b2dc0fbf41d95e4511
parentc45cde982d09075b5f120e0ff5b6b1283d501421 (diff)
downloadscilab-fe0e4c2d54b392756a6012bff5443d68ee502290.zip
scilab-fe0e4c2d54b392756a6012bff5443d68ee502290.tar.gz
[atoms] prevent unzip of spurious __MACOSX under Darwin
This directory is created when zip archives are made from the Finder, i.e. not from the command line. It breaks the installation process of the package, as a single directory is expected after unzip. http://mailinglists.scilab.org/Scilab-users-lincos-instruction-example-file-pendulum-anim45-zcos-is-corrupted-Buggzilla-16221-tp4039887p4039990.html Change-Id: I0aa658b1deff9a8c3ad051ae36e7309dabf6d1ef
-rw-r--r--scilab/modules/atoms/macros/atoms_internals/atomsExtract.sci4
1 files changed, 4 insertions, 0 deletions
diff --git a/scilab/modules/atoms/macros/atoms_internals/atomsExtract.sci b/scilab/modules/atoms/macros/atoms_internals/atomsExtract.sci
index c3e3803..1778eea 100644
--- a/scilab/modules/atoms/macros/atoms_internals/atomsExtract.sci
+++ b/scilab/modules/atoms/macros/atoms_internals/atomsExtract.sci
@@ -85,6 +85,10 @@ function dir_created = atomsExtract(archive_in,dir_out)
85 85
86 extract_cmd = extract_cmd + " -q -o """ + archive_in + """ -d """ + pathconvert(dir_out,%F) +""""; 86 extract_cmd = extract_cmd + " -q -o """ + archive_in + """ -d """ + pathconvert(dir_out,%F) +"""";
87 87
88 if getos() == "Darwin"
89 extract_cmd = extract_cmd + " -x __MACOSX/*"
90 end
91
88 end 92 end
89 93
90 [rep,stat,err] = unix_g(extract_cmd); 94 [rep,stat,err] = unix_g(extract_cmd);