From c658a251710a5d862f049df4c8edbf50ae18700b Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Fri, 3 May 2024 23:39:36 +0900
Subject: [PATCH] all: replace execabs with os/exec

os/exec no longer searches executablse in the current directory as of
Go 1.19. See https://go.dev/blog/path-security and https://go.dev/issue/43724.
---
 cmd/ebitenmobile/gobind.go               | 2 +-
 cmd/ebitenmobile/gomobile.go             | 2 +-
 cmd/ebitenmobile/main.go                 | 2 +-
 internal/png/gen.go                      | 2 +-
 internal/processtest/processtest_test.go | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cmd/ebitenmobile/gobind.go b/cmd/ebitenmobile/gobind.go
index db23da703..18ccb9a6a 100644
--- a/cmd/ebitenmobile/gobind.go
+++ b/cmd/ebitenmobile/gobind.go
@@ -23,10 +23,10 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/tools/go/packages"
 )
 
diff --git a/cmd/ebitenmobile/gomobile.go b/cmd/ebitenmobile/gomobile.go
index 560155ac3..29ad52d55 100644
--- a/cmd/ebitenmobile/gomobile.go
+++ b/cmd/ebitenmobile/gomobile.go
@@ -18,13 +18,13 @@ import (
 	_ "embed"
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"runtime/debug"
 
 	// Add a dependency on gomobile in order to get the version via debug.ReadBuildInfo().
 	_ "github.com/ebitengine/gomobile/geom"
-	exec "golang.org/x/sys/execabs"
 )
 
 //go:embed gobind.go
diff --git a/cmd/ebitenmobile/main.go b/cmd/ebitenmobile/main.go
index da6e60418..dbdef5558 100644
--- a/cmd/ebitenmobile/main.go
+++ b/cmd/ebitenmobile/main.go
@@ -27,12 +27,12 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 	"text/template"
 	"unicode"
 
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/tools/go/packages"
 )
 
diff --git a/internal/png/gen.go b/internal/png/gen.go
index 4020ede23..b4e4dfce4 100644
--- a/internal/png/gen.go
+++ b/internal/png/gen.go
@@ -23,13 +23,13 @@ import (
 	"go/parser"
 	"go/token"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"runtime"
 	"strconv"
 	"strings"
 
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/tools/go/ast/astutil"
 )
 
diff --git a/internal/processtest/processtest_test.go b/internal/processtest/processtest_test.go
index 1d814b9df..e72e0df3a 100644
--- a/internal/processtest/processtest_test.go
+++ b/internal/processtest/processtest_test.go
@@ -20,14 +20,13 @@ import (
 	"bytes"
 	"context"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
 	"sync"
 	"testing"
 	"time"
-
-	exec "golang.org/x/sys/execabs"
 )
 
 func isWSL() (bool, error) {