get: Cope with an empty ssh-agent

pkern · pkern · commit 32defca82144 · 2025-02-08T22:54:34.000+01:00
ssh-add -L returns 1 if the agent is empty and 2 if the agent could not
be reached. Ignore the first case, as there is nothing to remove.
diff --git a/cmd/get.go b/cmd/get.go
@@ -116,7 +116,7 @@ var getCmd = &cobra.Command{
 		}
 
 		stdout, err = exec.Command("ssh-add", "-L").Output()
-		if err != nil {
+		if exiterr, ok := err.(*exec.ExitError); (ok && exiterr.ExitCode() == 2) || (!ok && err != nil) {
 			return fmt.Errorf("could not query the SSH agent for its keys: %w", err)
 		}
 		var remove bytes.Buffer

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ var getCmd = &cobra.Command{`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`stdout, err = exec.Command("ssh-add", "-L").Output()`
`119`		`- if err != nil {`
	`119`	`+ if exiterr, ok := err.(*exec.ExitError); (ok && exiterr.ExitCode() == 2) \|\| (!ok && err != nil) {`
`120`	`120`	`return fmt.Errorf("could not query the SSH agent for its keys: %w", err)`
`121`	`121`	`}`
`122`	`122`	`var remove bytes.Buffer`