NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commit3f65bd1

authored

fix: ignore surronding whitespace for cli config (#12250)

* fix: ignore surronding whitespace for cli configCli config files break if you edit them manually with any editor.Editors drop a newline at the end, and we not break on this.If a developer manually edits a file, it should still work

1 parent475c365 commit3f65bd1Copy full SHA for 3f65bd1

File tree

1 file changed

-2

lines changed

cli/config
- file.go

1 file changed

-2

lines changed

`‎cli/config/file.go`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"io"`
`5`	`5`	`"os"`
`6`	`6`	`"path/filepath"`
	`7`	`+"strings"`
`7`	`8`
`8`	`9`	`"github.com/kirsle/configdir"`
`9`	`10`	`"golang.org/x/xerrors"`
`@@ -85,13 +86,14 @@ func (f File) Write(s string) error {`
`85`	`86`	`returnwrite(string(f),0o600, []byte(s))`
`86`	`87`	`}`
`87`	`88`
`88`		`-// Read reads the file to a string.`
	`89`	`+// Read reads the file to a string. All leading and trailing whitespace`
	`90`	`+// is removed.`
`89`	`91`	`func (fFile)Read() (string,error) {`
`90`	`92`	`iff=="" {`
`91`	`93`	`return"",xerrors.Errorf("empty file path")`
`92`	`94`	`}`
`93`	`95`	`byt,err:=read(string(f))`
`94`		`-returnstring(byt),err`
	`96`	`+returnstrings.TrimSpace(string(byt)),err`
`95`	`97`	`}`
`96`	`98`
`97`	`99`	`// open opens a file in the configuration directory,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3f65bd1

File tree

1 file changed

1 file changed

`‎cli/config/file.go`

0 commit comments