glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2025-05-06 20:27:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Delete findCWD method from util

Browse source 
It was unused
This commit is contained in:
bogem 2016-08-30 19:33:05 +05:00
parent 6953393ddd
commit d120ea2ddb
1 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
util.go
View file

@ -68,10 +68,10 @@ func absPathify(inPath string) string {
p, err := filepath.Abs(inPath) p, err := filepath.Abs(inPath)
if err == nil { if err == nil {
return filepath.Clean(p) return filepath.Clean(p)
} else {
jww.ERROR.Println("Couldn't discover absolute path")
jww.ERROR.Println(err)
} }
jww.ERROR.Println("Couldn't discover absolute path")
jww.ERROR.Println(err)
return "" return ""
} }
@ -107,29 +107,6 @@ func userHomeDir() string {
return os.Getenv("HOME") return os.Getenv("HOME")
} }
func findCWD() (string, error) {
serverFile, err := filepath.Abs(os.Args[0])
if err != nil {
return "", fmt.Errorf("Can't get absolute path for executable: %v", err)
}
path := filepath.Dir(serverFile)
realFile, err := filepath.EvalSymlinks(serverFile)
if err != nil {
if _, err = os.Stat(serverFile + ".exe"); err == nil {
realFile = filepath.Clean(serverFile + ".exe")
}
}
if err == nil && realFile != serverFile {
path = filepath.Dir(realFile)
}
return path, nil
}
func unmarshallConfigReader(in io.Reader, c map[string]interface{}, configType string) error { func unmarshallConfigReader(in io.Reader, c map[string]interface{}, configType string) error {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
buf.ReadFrom(in) buf.ReadFrom(in)