subprocess_run: add cwd option

extract_zstd: try with cmake, fallback zstd

Author: scivision

+stdlib/+fileio/extract_zstd.m

@@ -1,20 +1,42 @@
 function extract_zstd(archive, out_dir)
 % extract a zstd file "archive" to "out_dir"
 % out_dir need not exist yet, but its parent must
-% we do this in two steps to be reliable with old tar versions
-% https://www.scivision.dev/tar-extract-zstd
+% We do this with CMake to avoid problems with old system tar.
+% For our user audience, CMake is at least as likely to be installed as Zstd.
 
 arguments
   archive (1,1) string
   out_dir (1,1) string
 end
 
-import stdlib.fileio.expanduser
+import stdlib.fileio.absolute_path
 import stdlib.fileio.which
+import stdlib.sys.subprocess_run
 
-archive = expanduser(archive);
+archive = absolute_path(archive);
+out_dir = absolute_path(out_dir);
 
 assert(isfile(archive), "%s is not a file", archive)
+assert(isfolder(out_dir), "%s is not a folder", out_dir)
+
+exe = which("cmake");
+if isempty(exe)
+  extract_zstd_bin(archive, outdir)
+end
+
+[ret, msg] = subprocess_run([exe, "-E", "tar", "xf", archive], "cwd", out_dir);
+assert(ret == 0, "problem extracting %s   %s", archive, msg)
+
+end
+
+
+function extract_zstd_bin(archive, out_dir)
+% Extract .zst in two steps .zst => .tar =>
+% to avoid problems with old system tar.
+arguments
+  archive (1,1) string
+  out_dir (1,1) string
+end
 
 exe = which("zstd");
 assert(~isempty(exe), "need to have Zstd installed: https://github.com/facebook/zstd")
@@ -26,5 +48,4 @@ function extract_zstd(archive, out_dir)
 
 untar(tar_arc, out_dir)
 delete(tar_arc)
-
 end

+stdlib/+sys/subprocess_run.m

@@ -1,4 +1,4 @@
-function [status, msg] = subprocess_run(cmd_array, env)
+function [status, msg] = subprocess_run(cmd_array, opt)
 % handle command lines with spaces
 % input each segment of the command as an element in a string array
 % this is how python subprocess.run works
@@ -7,12 +7,18 @@
 % sys.subprocess_run(["mpiexec", "-help2"])
 % sys.subprocess_run(["ls", "-l"])
 % sys.subprocess_run(["dir", "/Q", "/L"])
+%
+% NOTE: if cwd option used, any paths must be absolute or relative to cwd.
+% otherwise, they are relative to pwd.
 
 arguments
   cmd_array (1,:) string
-  env (1,1) struct = struct()
+  opt.env (1,1) struct = struct()
+  opt.cwd string {mustBeScalarOrEmpty} = string.empty
 end
 
+import stdlib.fileio.absolute_path
+
 exe = space_quote(cmd_array(1));
 
 if length(cmd_array) > 1
@@ -21,18 +27,29 @@
   cmd = exe;
 end
 
-if ~isempty(fieldnames(env))
-  for f = string(fieldnames(env)).'
+if ~isempty(fieldnames(opt.env))
+  for f = string(fieldnames(opt.env)).'
     if ispc
-      cmd = append("set ", f, "=", env.(f), " && ", cmd);
+      cmd = append("set ", f, "=", opt.env.(f), " && ", cmd);
     else
-      cmd = append(f, "=", env.(f), " ", cmd);
+      cmd = append(f, "=", opt.env.(f), " ", cmd);
     end
   end
 end
 
+if ~isempty(opt.cwd)
+  cwd = absolute_path(opt.cwd);
+  assert(isfolder(cwd), "subprocess_run: %s is not a folder", cwd)
+  oldcwd = pwd;
+  cd(cwd)
+end
+
 [status, msg] = system(cmd);
 
+if ~isempty(opt.cwd)
+  cd(oldcwd)
+end
+
 end
 
 

+stdlib/TestSys.m

@@ -2,6 +2,15 @@
 
 methods (Test)
 
+function test_run(tc)
+if ispc
+  cmd = 'dir';
+else
+  cmd = 'ls';
+end
+tc.verifyEqual(stdlib.sys.subprocess_run(cmd), 0)
+end
+
 function test_find_fortran(tc)
 import matlab.unittest.constraints.IsOfClass
 tc.verifyThat(stdlib.sys.find_fortran_compiler(), IsOfClass('string'))

codemeta.json

@@ -8,7 +8,7 @@
     "downloadUrl": "https://github.com/geospace-code/matlab-stdlib/releases",
     "issueTracker": "https://github.com/geospace-code/matlab-stdlib/issues",
     "name": "matlab-stdlib",
-    "version": "4.1.3",
+    "version": "4.1.4",
     "identifier": "10.5281/zenodo.3964541",
     "description": "Matlab unofficial standard library, including HDF5 / NetCDF4 functions that should be included in Matlab.",
     "applicationCategory": "computation",