From 639d196a451f7d0632687a0ea8faddeebe0ce2f7 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Thu, 31 Jul 2014 02:33:58 -0700
Subject: [PATCH] linted config
---
cmd/ipfs/config.go | 9 ++++++---
cmd/ipfs/ipfs.go | 2 +-
config/config.go | 10 +++++-----
config/config_test.go | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/cmd/ipfs/config.go b/cmd/ipfs/config.go
index ec74280c..4d7826a6 100644
--- a/cmd/ipfs/config.go
+++ b/cmd/ipfs/config.go
@@ -45,7 +45,7 @@ func init() {
func configCmd(c *commander.Command, inp []string) error {
// todo: implement --config filename flag.
- filename, err := config.ConfigFilename("")
+ filename, err := config.Filename("")
if err != nil {
return err
}
@@ -103,8 +103,11 @@ func configCat(filename string) error {
}
defer file.Close()
- _, err = io.Copy(os.Stdout, file)
- return err
+ if _, err = io.Copy(os.Stdout, file); err != nil {
+ return err
+ }
+ u.POut("\n")
+ return nil
}
func configEditor(filename string) error {
diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go
index daa63960..5f0acc66 100644
--- a/cmd/ipfs/ipfs.go
+++ b/cmd/ipfs/ipfs.go
@@ -67,7 +67,7 @@ func main() {
func localNode() (*core.IpfsNode, error) {
//todo implement config file flag
- cfg, err := config.ConfigLoad("")
+ cfg, err := config.Load("")
if err != nil {
return nil, err
}
diff --git a/config/config.go b/config/config.go
index 763943ae..f1907edf 100644
--- a/config/config.go
+++ b/config/config.go
@@ -32,8 +32,8 @@ var defaultConfigFile = `{
}
`
-// ConfigFilename returns the proper tilde expanded config filename.
-func ConfigFilename(filename string) (string, error) {
+// Filename returns the proper tilde expanded config filename.
+func Filename(filename string) (string, error) {
if len(filename) == 0 {
filename = defaultConfigFilePath
}
@@ -42,9 +42,9 @@ func ConfigFilename(filename string) (string, error) {
return u.TildeExpansion(filename)
}
-// ConfigLoad reads given file and returns the read config, or error.
-func ConfigLoad(filename string) (*Config, error) {
- filename, err := ConfigFilename(filename)
+// Load reads given file and returns the read config, or error.
+func Load(filename string) (*Config, error) {
+ filename, err := Filename(filename)
if err != nil {
return nil, err
}
diff --git a/config/config_test.go b/config/config_test.go
index a483c24e..0b79673b 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -7,7 +7,7 @@ import (
func TestConfig(t *testing.T) {
- cfg, err := ConfigLoad("")
+ cfg, err := Load("")
if err != nil {
t.Error(err)
return
--
GitLab