fix(watch): 修正 windows 下无法正确启动新进程的问题

caixw · Sep 8, 2024 · fdfe5dd · fdfe5dd
1 parent 9ed7855
commit fdfe5dd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/caixw/gobuild
 
 require (
 	github.com/fsnotify/fsnotify v1.7.0
-	github.com/issue9/assert/v4 v4.3.0
+	github.com/issue9/assert/v4 v4.3.1
 	github.com/issue9/localeutil v0.27.2
 	github.com/issue9/source v0.11.5
 	github.com/issue9/term/v3 v3.3.1

diff --git a/go.sum b/go.sum
@@ -1,7 +1,7 @@
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/issue9/assert/v4 v4.3.0 h1:W3XDKmttsfzihYGxJ9rJoL2ViJgWERB9IxfHcxjv65U=
-github.com/issue9/assert/v4 v4.3.0/go.mod h1:v7qDRXi7AsaZZNh8eAK2rkLJg5/clztqQGA1DRv9Lv4=
+github.com/issue9/assert/v4 v4.3.1 h1:dHYODk1yV7j/1baIB6K6UggI4r1Hfuljqic7PaDbwLg=
+github.com/issue9/assert/v4 v4.3.1/go.mod h1:v7qDRXi7AsaZZNh8eAK2rkLJg5/clztqQGA1DRv9Lv4=
 github.com/issue9/errwrap v0.3.2 h1:7KEme9Pfe75M+sIMcPCn/DV90wjnOcRbO4DXVAHj3Fw=
 github.com/issue9/errwrap v0.3.2/go.mod h1:KcCLuUGiffjooLCUjL89r1cyO8/HT/VRcQrneO53N3A=
 github.com/issue9/localeutil v0.27.2 h1:RkFLlDS/0W/YEIUUPyokdtegTp+DFMZ7/iR1V9OHUQg=

diff --git a/watch/options.go b/watch/options.go
@@ -9,6 +9,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"time"
 
@@ -84,8 +85,8 @@ func (opt *Options) sanitize() (err error) {
 	}
 	// BUG: 如果获得的 opt.wd == /，那么 appName 将是个非法值。
 	opt.appName = filepath.Join(opt.wd, filepath.Base(opt.wd))
-	if goexe := os.Getenv("GOEXE"); goexe != "" {
-		opt.appName += goexe
+	if runtime.GOOS == "windows" {
+		opt.appName += ".exe"
 	}
 
 	// 根据 wd 获取项目根目录，从而拿到需要监视的列表

diff --git a/watch/options_test.go b/watch/options_test.go
@@ -6,6 +6,7 @@ package watch
 
 import (
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -21,7 +22,12 @@ func TestOptions_sanitize(t *testing.T) {
 	opt.MainFiles = "./"
 	a.NotError(opt.sanitize()).
 		Equal(opt.WatcherFrequency, MinWatcherFrequency).
-		True(strings.HasSuffix(opt.appName, "watch"))
+		When(runtime.GOOS == "windows", func(a *assert.Assertion) {
+			a.True(strings.HasSuffix(opt.appName, "watch.exe"))
+		}).
+		When(runtime.GOOS != "windows", func(a *assert.Assertion) {
+			a.True(strings.HasSuffix(opt.appName, "watch"))
+		})
 
 	opt.Excludes = []string{}
 	a.NotError(opt.sanitize())