linted config
Juan Batiz-Benet committed
Jul 31, 2014 at 02:33 UTC
639d196a451f7d0632687a0ea8faddeebe0ce2f7
4 files changed
+13
-10
cmd/ipfs/config.go
+6
-3
@@ -45,7 +45,7 @@ func init() {
45
func configCmd(c *commander.Command, inp []string) error {
46
47
// todo: implement --config filename flag.
48
- filename, err := config.ConfigFilename("")
48
+ filename, err := config.Filename("")
49
if err != nil {
50
return err
51
}
@@ -103,8 +103,11 @@ func configCat(filename string) error {
103
}
104
defer file.Close()
105
106
- _, err = io.Copy(os.Stdout, file)
107
- return err
106
+ if _, err = io.Copy(os.Stdout, file); err != nil {
107
+ return err
108
+ }
109
+ u.POut("\n")
110
+ return nil
111
}
112
113
func configEditor(filename string) error {
cmd/ipfs/ipfs.go
+1
-1
@@ -67,7 +67,7 @@ func main() {
67
68
func localNode() (*core.IpfsNode, error) {
69
//todo implement config file flag
70
- cfg, err := config.ConfigLoad("")
70
+ cfg, err := config.Load("")
71
if err != nil {
72
return nil, err
73
}
config/config.go
+5
-5
@@ -32,8 +32,8 @@ var defaultConfigFile = `{
32
}
33
`
34
35
-// ConfigFilename returns the proper tilde expanded config filename.
36
-func ConfigFilename(filename string) (string, error) {
35
+// Filename returns the proper tilde expanded config filename.
36
+func Filename(filename string) (string, error) {
37
if len(filename) == 0 {
38
filename = defaultConfigFilePath
39
}
@@ -42,9 +42,9 @@ func ConfigFilename(filename string) (string, error) {
42
return u.TildeExpansion(filename)
43
}
44
45
-// ConfigLoad reads given file and returns the read config, or error.
46
-func ConfigLoad(filename string) (*Config, error) {
47
- filename, err := ConfigFilename(filename)
45
+// Load reads given file and returns the read config, or error.
46
+func Load(filename string) (*Config, error) {
47
+ filename, err := Filename(filename)
48
if err != nil {
49
return nil, err
50
}
config/config_test.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
8
func TestConfig(t *testing.T) {
9
10
- cfg, err := ConfigLoad("")
10
+ cfg, err := Load("")
11
if err != nil {
12
t.Error(err)
13
return