subprocess_run: env= uses R2022b+ syntax for robustness

Author: scivision

+stdlib/+sys/subprocess_run.m

@@ -21,7 +21,7 @@
 
 arguments
   cmd_array (1,:) string
-  opt.env (1,1) struct = struct()
+  opt.env struct {mustBeScalarOrEmpty} = struct.empty
   opt.cwd string {mustBeScalarOrEmpty} = string.empty
 end
 
@@ -33,23 +33,25 @@
   cmd = exe;
 end
 
-for f = string(fieldnames(opt.env)).'
-  if ispc
-    cmd = append("set ", f, "=", opt.env.(f), " && ", cmd);
-  else
-    cmd = append(f, "=", opt.env.(f), " ", cmd);
-  end
-end
-
 if ~isempty(opt.cwd)
   cwd = stdlib.fileio.absolute_path(opt.cwd);
   assert(isfolder(cwd), "subprocess_run: %s is not a folder", cwd)
   oldcwd = pwd;
   cd(cwd)
 end
 
-[status, msg] = system(cmd);
+old = verLessThan('matlab', '9.13');
+if old && ~isempty(opt.env)
+  warning("Matlab >= R2022b required for 'env' option of subprocess_run()")
+end
+
+if isempty(opt.env) || old
+  [status, msg] = system(cmd);
+else
+  envCell = namedargs2cell(opt.env);
 
+  [status, msg] = system(cmd, envCell{:});
+end
 if ~isempty(opt.cwd)
   cd(oldcwd)
 end

+stdlib/+test/TestSys.m

@@ -4,20 +4,17 @@
 
 function test_simple_run(tc)
 
-import stdlib.sys.subprocess_run
-
 if ispc
   c = 'dir';
 else
   c = 'ls';
 end
-tc.verifyEqual(subprocess_run(c), 0)
+tc.verifyEqual(stdlib.sys.subprocess_run(c), 0)
 end
 
 
 function test_env_run(tc)
-
-import stdlib.sys.subprocess_run
+tc.assumeFalse(verLessThan('matlab', '9.13'), "system(..., EnvName=, EnvVal=) requires Matlab R2022b+")
 
 names = ["TEST1", "TEST2"];
 vals = ["test123", "test321"];
@@ -26,12 +23,14 @@ function test_env_run(tc)
 
 % NOTE: test function cannot get specific variables without invoking a
 % subshell, as echo is evaluated in current shell before &&
+% Thus we just print the entire environment
 if ispc
   c = "set";
 else
   c = "env";
 end
-[ret, msg] = subprocess_run(c, "env", env);
+
+[ret, msg] = stdlib.sys.subprocess_run(c, env=env);
 tc.verifyEqual(ret, 0)
 tc.verifyTrue(contains(msg, names(1) + "=" + vals(1)) && contains(msg, names(2) + "=" + vals(2)))