Merge pull request #108 from euank/pass-trim‮‮‮‮‮‮‮‮trim-pass

Vincent Demeester · web-flow · commit 8502b5359201 · 2018-06-27T14:24:08.000+02:00
pass: trim pass show output
diff --git a/pass/pass_linux.go b/pass/pass_linux.go
@@ -58,7 +58,8 @@ func runPass(stdin string, args ...string) (string, error) {
 		return "", fmt.Errorf("%s: %s", err, stderr.String())
 	}
 
-	return stdout.String(), nil
+	// trim newlines; pass v1.7.1+ includes a newline at the end of `show` output
+	return strings.TrimRight(stdout.String(), "\n\r"), nil
 }
 
 // Pass handles secrets using Linux secret-service as a store.

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ func runPass(stdin string, args ...string) (string, error) {`
`58`	`58`	`return "", fmt.Errorf("%s: %s", err, stderr.String())`
`59`	`59`	`}`
`60`	`60`
`61`		`- return stdout.String(), nil`
	`61`	+ // trim newlines; pass v1.7.1+ includes a newline at the end of `show` output
	`62`	`+ return strings.TrimRight(stdout.String(), "\n\r"), nil`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`// Pass handles secrets using Linux secret-service as a store.`