From 1c85830bc7003f9ab8ffd4b6d469a87f7fa5535d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sat, 22 Jun 2024 11:49:30 +0200
Subject: [PATCH] common/hexec: Fall back to the binary in PATH if npx fails

Closes #12486
---
 common/hexec/exec.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/hexec/exec.go b/common/hexec/exec.go
index 12775bd1ce8..49291354dd0 100644
--- a/common/hexec/exec.go
+++ b/common/hexec/exec.go
@@ -143,8 +143,18 @@ func (e *Exec) New(name string, arg ...any) (Runner, error) {
 	return cm.command(arg...)
 }
 
-// Npx is a convenience method to create a Runner running npx --no-install <name> <args.
+// Npx will try to run npx, and if that fails, it will
+// try to run the binary directly.
 func (e *Exec) Npx(name string, arg ...any) (Runner, error) {
+	r, err := e.npx(name, arg...)
+	if err == nil {
+		return r, nil
+	}
+	return e.New(name, arg...)
+}
+
+// npx is a convenience method to create a Runner running npx --no-install <name> <args.
+func (e *Exec) npx(name string, arg ...any) (Runner, error) {
 	arg = append(arg[:0], append([]any{"--no-install", name}, arg[0:]...)...)
 	return e.New("npx", arg...)
 }