MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-22 10:37:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use filepath everywhere instead of path.{} functions for portability - fixes #656

Browse Source
This commit is contained in:
Harshavardhana
2015-06-18 16:02:34 -07:00
parent 285b1cc5d8
commit 641f07cecf
17 changed files with 94 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/config/config.go
View File

@@ -21,7 +21,7 @@ import (
"io"
"os"
"os/user"
"path"
"path/filepath"
"sync"
"github.com/minio/minio/pkg/iodine"
@@ -49,13 +49,13 @@ func (c *Config) SetupConfig() error {
return iodine.New(err, nil)
}
confPath := path.Join(u.HomeDir, ".minio")
confPath := filepath.Join(u.HomeDir, ".minio")
if err := os.MkdirAll(confPath, 0700); err != nil {
return iodine.New(err, nil)
}
c.ConfigPath = confPath
c.ConfigFile = path.Join(c.ConfigPath, "config.json")
c.ConfigFile = filepath.Join(c.ConfigPath, "config.json")
if _, err := os.Stat(c.ConfigFile); os.IsNotExist(err) {
_, err = os.Create(c.ConfigFile)
if err != nil {

4
pkg/api/config/config_test.go
View File

@@ -19,7 +19,7 @@ package config
import (
"io/ioutil"
"os"
"path"
"path/filepath"
"sync"
"testing"
@@ -38,7 +38,7 @@ func (s *MySuite) TestConfig(c *C) {
conf.ConfigLock = new(sync.RWMutex)
conf.ConfigPath, _ = ioutil.TempDir("/tmp", "minio-test-")
defer os.RemoveAll(conf.ConfigPath)
conf.ConfigFile = path.Join(conf.ConfigPath, "config.json")
conf.ConfigFile = filepath.Join(conf.ConfigPath, "config.json")
if _, err := os.Stat(conf.ConfigFile); os.IsNotExist(err) {
_, err = os.Create(conf.ConfigFile)
if err != nil {