1
0
mirror of https://github.com/pocketbase/pocketbase.git synced 2025-09-16 17:46:19 +02:00

added osutils.IsProbablyGoRun

This commit is contained in:
Gani Georgiev
2025-09-06 18:14:20 +03:00
parent a088cf6379
commit 40f2ba731c
6 changed files with 60 additions and 8 deletions

View File

@@ -8,9 +8,11 @@
- Added `os.Root` bindings to the JSVM ([`$os.openRoot`](https://pocketbase.io/jsvm/functions/_os.openRoot.html), [`$os.openInRoot`](https://pocketbase.io/jsvm/functions/_os.openInRoot.html)).
- Various minor UI improvements (updated collections indexes merge UI, enabled seconds in the datepicker, updated helper texts, etc.).
- Added `osutils.IsProbablyGoRun()` helper to loosely check if the executable was started using `go run`.
- ⚠️ Updated the min package Go version to 1.24.0 and bumped Go dependencies.
- Various minor UI improvements (updated collections indexes UI, enabled seconds in the datepicker, updated helper texts, etc.).
- ⚠️ Updated the minimum package Go version to 1.24.0 and bumped Go dependencies.
## v0.29.3

View File

@@ -88,8 +88,7 @@ func findOrCreateInstallerSuperuser(app core.App) (*core.Record, error) {
}
func executablePath() string {
// most likely ran with go run
if strings.HasPrefix(os.Args[0], os.TempDir()) {
if osutils.IsProbablyGoRun() {
return "go run ."
}

View File

@@ -5,7 +5,6 @@ import (
"net/http"
"os"
"path/filepath"
"strings"
"github.com/pocketbase/pocketbase"
"github.com/pocketbase/pocketbase/apis"
@@ -14,6 +13,7 @@ import (
"github.com/pocketbase/pocketbase/plugins/jsvm"
"github.com/pocketbase/pocketbase/plugins/migratecmd"
"github.com/pocketbase/pocketbase/tools/hook"
"github.com/pocketbase/pocketbase/tools/osutils"
)
func main() {
@@ -123,8 +123,7 @@ func main() {
// the default pb_public dir location is relative to the executable
func defaultPublicDir() string {
if strings.HasPrefix(os.Args[0], os.TempDir()) {
// most likely ran with go run
if osutils.IsProbablyGoRun() {
return "./pb_public"
}

View File

@@ -14,6 +14,7 @@ import (
"github.com/pocketbase/pocketbase/core"
"github.com/pocketbase/pocketbase/tools/hook"
"github.com/pocketbase/pocketbase/tools/list"
"github.com/pocketbase/pocketbase/tools/osutils"
"github.com/pocketbase/pocketbase/tools/routine"
"github.com/spf13/cobra"
@@ -293,7 +294,7 @@ func (pb *PocketBase) skipBootstrap() bool {
// note: we are using os.Args[0] and not os.Executable() since it could
// break existing aliased binaries (eg. the community maintained homebrew package)
func inspectRuntime() (baseDir string, withGoRun bool) {
if strings.HasPrefix(os.Args[0], os.TempDir()) {
if osutils.IsProbablyGoRun() {
// probably ran with go run
withGoRun = true
baseDir, _ = os.Getwd()

View File

@@ -63,3 +63,17 @@ func YesNoPrompt(message string, fallback bool) bool {
}
}
}
// IsProbablyGoRun loosely checks if the current executable is running
// as a result of "go run".
func IsProbablyGoRun() bool {
runDirs := []string{os.TempDir(), os.Getenv("GOCACHE")}
for _, dir := range runDirs {
if dir != "" && strings.HasPrefix(os.Args[0], dir) {
return true
}
}
return false
}

View File

@@ -64,3 +64,40 @@ func TestYesNoPrompt(t *testing.T) {
})
}
}
func TestIsProbablyGoRun(t *testing.T) {
scenarios := []struct {
arg string
envs map[string]string
expected bool
}{
{"", nil, false},
{"a/b/c", nil, false},
{"/a/b/c", nil, false},
{"/a/b/c", map[string]string{"GOCACHE": "/b/"}, false},
{"/a/b/c", map[string]string{"GOCACHE": "/a/"}, true},
{os.TempDir() + "/a/b/c", nil, true},
}
originalArgs := os.Args
defer func() {
os.Args = originalArgs
}()
for _, s := range scenarios {
t.Run(s.arg, func(t *testing.T) {
os.Args = []string{s.arg}
for k, v := range s.envs {
defer os.Setenv(k, os.Getenv(k))
os.Setenv(k, v)
}
result := osutils.IsProbablyGoRun()
if result != s.expected {
t.Fatalf("Expected %v, got %v", s.expected, result)
}
})
}
}