Boostrap.py: Check for npm in path before trying to use it (#23795)

Author: dschuff

bootstrap.py

@@ -23,7 +23,7 @@
   ('npm packages', [
      'package.json',
      'package-lock.json'
-   ], [shutil.which('npm'), 'ci']),
+   ], ['npm', 'ci']),
   ('create entry points', [
      'tools/maint/create_entry_points.py',
      'tools/maint/run_python.bat',
@@ -34,7 +34,7 @@
      'test/third_party/posixtestsuite/',
      'test/third_party/googletest',
      'test/third_party/wasi-test-suite',
-   ], [shutil.which('git'), 'submodule', 'update', '--init']),
+   ], ['git', 'submodule', 'update', '--init']),
 ]
 
 
@@ -87,6 +87,11 @@ def main(args):
     if args.dry_run:
       print(' (skipping: dry run) -> %s' % ' '.join(cmd))
       continue
+    orig_exe = cmd[0]
+    if not os.path.isabs(orig_exe):
+      cmd[0] = shutil.which(orig_exe)
+      if not cmd[0]:
+        utils.exit_with_error(f'command not found: {orig_exe}')
     print(' -> %s' % ' '.join(cmd))
     shared.run_process(cmd, cwd=utils.path_from_root())
     utils.safe_ensure_dirs(STAMP_DIR)