theluyuan/RWKV-Runner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix windows cmd waiting

Browse Source
This commit is contained in:
josc146 2023-12-12 23:48:32 +08:00
parent 556b667cc0
commit da632565d5
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend-golang/file.go
View File

@ -204,6 +204,10 @@ func (a *App) OpenFileFolder(path string, relative bool) error {
} }
func (a *App) StartFile(path string) error { func (a *App) StartFile(path string) error {
_, err := CmdHelper(true, path) cmd, err := CmdHelper(true, path)
if err != nil {
return err
}
err = cmd.Start()
return err return err
} }

11
backend-golang/utils.go
View File

@ -44,21 +44,20 @@ func CmdHelper(hideWindow bool, args ...string) (*exec.Cmd, error) {
cmd := exec.Command(cmdHelper, args...) cmd := exec.Command(cmdHelper, args...)
cmd.SysProcAttr = &syscall.SysProcAttr{} cmd.SysProcAttr = &syscall.SysProcAttr{}
//go:custom_build windows cmd.SysProcAttr.HideWindow = hideWindow //go:custom_build windows cmd.SysProcAttr.HideWindow = hideWindow
err = cmd.Start()
if err != nil {
return nil, err
}
return cmd, nil return cmd, nil
} }
func Cmd(args ...string) (string, error) { func Cmd(args ...string) (string, error) {
switch platform := runtime.GOOS; platform { switch platform := runtime.GOOS; platform {
case "windows": case "windows":
cmd, err := CmdHelper(false, args...) cmd, err := CmdHelper(true, args...)
if err != nil {
return "", err
}
_, err = cmd.CombinedOutput()
if err != nil { if err != nil {
return "", err return "", err
} }
cmd.Wait()
return "", nil return "", nil
case "darwin": case "darwin":
ex, err := os.Executable() ex, err := os.Executable()