which:windows: auto-append .exe

Author: scivision

+stdlib/which.m

@@ -7,9 +7,9 @@
 %
 % find_all option finds all executables specified under PATH, instead of only the first
 
-function exe = which(filename, fpath, find_all)
+function exe = which(cmd, fpath, find_all)
 arguments
-  filename {mustBeTextScalar}
+  cmd {mustBeTextScalar}
   fpath (1,:) string = string.empty
   find_all (1,1) logical = false
 end
@@ -20,13 +20,21 @@
   exe = '';
 end
 
-if isfile(filename) && stdlib.is_exe(filename)
-  exe = filename;
+%% on Windows, append .exe if not suffix is given
+if ispc() && strempty(stdlib.suffix(cmd))
+  pathext = '.exe';
+  if ~endsWith(cmd, pathext, IgnoreCase=true)
+    cmd = strcat(cmd, pathext);
+  end
+end
+%% full filename was given
+if isfile(cmd) && stdlib.is_exe(cmd)
+  exe = cmd;
   return
 end
 
 %  relative directory component, but path was not a file
-if ~strcmp(stdlib.filename(filename), filename)
+if ~strcmp(stdlib.filename(cmd), cmd)
   return
 end
 
@@ -48,7 +56,7 @@
 
   if strempty(p), continue, end
 
-  e = strcat(p, '/', filename);
+  e = strcat(p, '/', cmd);
   if isfile(e) && stdlib.is_exe(e)
     if find_all
       exe(end+1) = e; %#ok<AGROW>

test/TestIsExe.m

@@ -10,10 +10,9 @@ function test_is_exe(tc, p)
 end
 
 function test_matlabroot(tc)
-n = "matlab";
 
-f = matlabroot + "/bin/" + n;
-if ispc
+f = fullfile(matlabroot, "bin", "matlab");
+if ispc()
   f = f + ".exe";
 end
 

test/TestWhich.m

@@ -1,8 +1,8 @@
 classdef TestWhich < matlab.unittest.TestCase
 
 properties (TestParameter)
-mexe = {matlabroot + "/bin/" + matlab_name(), ...
-        fullfile(matlabroot, 'bin', matlab_name())}
+mexe = {matlabroot + "/bin/matlab", ...
+        fullfile(matlabroot, 'bin', 'matlab')}
 end
 
 methods (Test, TestTags="impure")
@@ -12,47 +12,54 @@ function test_which_name(tc)
 tc.verifyEmpty(stdlib.which(tempname()))
 
 if ispc
-  n = 'pwsh.exe';
+  names = ["pwsh", "pwsh.exe"];
 else
-  n = 'ls';
+  names = "ls";
 end
 %% which: Matlab in environment variable PATH
 % MacOS Matlab does not source .zshrc so Matlab is not on internal Matlab PATH
 % Unix-like OS may have Matlab as alias which is not visible to
 % stdlib.which()
 % virus scanners may block stdlib.which("cmd.exe") on Windows
-tc.verifyNotEmpty(stdlib.which(n))
+for n = names
+  exe = stdlib.which(n);
+  tc.verifyNotEmpty(exe, "Executable not found: " + n)
+  tc.verifyTrue(isfile(exe), "Executable is not a file: " + n)
+  tc.verifyTrue(stdlib.is_exe(exe), "Executable is not executable: " + n)
+end
 
 end
 
 
 function test_which_absolute(tc, mexe)
-tc.verifyEqual(stdlib.which(mexe), mexe)
-end
 
+r = mexe;
+if ispc()
+  r = strcat(r, '.exe');
+end
 
-function test_which_multipath(tc)
+tc.verifyEqual(stdlib.which(mexe), r)
 
-n = matlab_name();
+end
 
-paths = split(string(getenv('PATH')), pathsep);
-paths(end+1) = matlabroot + "/bin";
 
-exe = stdlib.which(n, paths);
+function test_which_onepath(tc)
 
-tc.verifyNotEmpty(exe, "Matlab not found by which()")
+tc.verifyNotEmpty(stdlib.which("matlab", fullfile(matlabroot, 'bin')), ...
+    "Matlab not found by which() given specific path=")
 
 end
 
-end
 
-end
+function test_which_multipath(tc)
 
+paths = split(string(getenv('PATH')), pathsep);
+paths(end+1) = fullfile(matlabroot, 'bin');
 
-function n = matlab_name()
+tc.verifyNotEmpty(stdlib.which("matlab", paths), "Matlab not found by which()")
 
-n = 'matlab';
-if ispc
-  n = strcat(n, '.exe');
 end
+
+end
+
 end