octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-02 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/syncthing: Better cli stdin handling (ref #9166) (#9281)

Browse Source 
Seems to work for me, @AudriusButkevicius.
This commit is contained in:
Jakob Borg 2023-12-11 21:15:52 +01:00 committed by GitHub
parent b71a930bfc
commit c53a1f210c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/syncthing/cli/main.go
View File

@ -10,7 +10,6 @@ import (
"bufio"
"fmt"
"os"
"os/exec"
"github.com/alecthomas/kong"
"github.com/flynn-archive/go-shlex"
@ -75,15 +74,21 @@ func (*stdinCommand) Run() error {
if len(input) == 0 {
continue
}
cmd := exec.Command(os.Args[0], append(args[1:], input...)...)
out, err := cmd.CombinedOutput()
fmt.Print(string(out))
var cli CLI
p, err := kong.New(&cli)
if err != nil {
if _, ok := err.(*exec.ExitError); ok {
// we will continue loop no matter the command succeeds or not
continue
}
return err
// can't happen, really
return fmt.Errorf("creating parser: %w", err)
}
ctx, err := p.Parse(input)
if err != nil {
fmt.Println("Error:", err)
continue
}
if err := ctx.Run(); err != nil {
fmt.Println("Error:", err)
continue
}
}
return scanner.Err()