which: more versions supported

Author: scivision

+stdlib/which.m

@@ -8,17 +8,23 @@
 % find_all option finds all executables specified under PATH, instead of only the first
 
 function exe = which(cmd, fpath, find_all)
-arguments
-  cmd (1,1) string
-  fpath (1,:) string = string.empty
-  find_all (1,1) logical = false
+% arguments
+%   cmd (1,1) string
+%   fpath (1,:) string = string.empty
+%   find_all (1,1) logical = false
+% end
+if nargin < 2
+  fpath = string.empty;
+end
+if nargin < 3
+  find_all = false;
 end
 
 exe = string.empty;
 
 %% on Windows, append .exe if not suffix is given
 if ispc() && stdlib.strempty(stdlib.suffix(cmd))
-  cmd = cmd + ".exe";
+  cmd = stdlib.append(cmd, '.exe');
 end
 %% full filename was given
 if stdlib.is_exe(cmd)
@@ -34,11 +40,17 @@
 
 % path given
 if stdlib.strempty(fpath)
-  fpath = string(getenv('PATH'));
+  fpath = getenv('PATH');
 end
 
+fpath = string(fpath);
+
 if isscalar(fpath)
-  fpath = split(fpath, pathsep).';
+  fpath = split(fpath, pathsep);
+end
+
+if iscolumn(fpath)
+  fpath = fpath.';
 end
 
 for p = fpath

test/TestWhich.m

@@ -3,12 +3,12 @@
     TestWhich < matlab.unittest.TestCase
 
 properties (TestParameter)
-mexe = {matlabroot + "/bin/matlab", ...
+mexe = {[matlabroot '/bin/matlab'], ...
         fullfile(matlabroot, 'bin/matlab')}
 end
 
 
-methods (Test, TestTags = {'R2019b'})
+methods (Test, TestTags = {'R2017b'})
 
 function test_which_name(tc)
 
@@ -27,7 +27,7 @@ function test_which_name(tc)
 for n = names
   exe = stdlib.which(n);
   tc.verifyNotEmpty(exe, "Executable not found: " + n)
-  tc.verifyThat(exe, matlab.unittest.constraints.IsFile, "Executable is not a file: " + n)
+  tc.verifyTrue(isfile(exe), "Executable is not a file: " + n)
   tc.verifyTrue(stdlib.is_exe(exe), "Executable is not executable: " + n)
 end
 
@@ -36,12 +36,12 @@ function test_which_name(tc)
 
 function test_which_absolute(tc, mexe)
 
-r = string(mexe);
+r = mexe;
 if ispc()
-  r = r + ".exe";
+  r = [r, '.exe'];
 end
 
-tc.assumeThat(r, matlab.unittest.constraints.IsFile)
+tc.assumeTrue(isfile(r))
 tc.assumeTrue(stdlib.is_exe(r))
 
 tc.verifyGreaterThan(strlength(stdlib.which(r)), 0, "Expected which(" + r + " ) to find " + r)
@@ -72,7 +72,7 @@ function testWhichNoPath(tc)
 tc.applyFixture(fx)
 
 tc.verifyEmpty(stdlib.which('matlab'), "Matlab found by which() given empty path")
-tc.verifyNotEmpty(stdlib.which('matlab', matlabroot + "/bin"))
+tc.verifyNotEmpty(stdlib.which('matlab', [matlabroot, '/bin']))
 end
 end