diff --git a/utils/file.go b/utils/file.go index 65254c1f..3203fc59 100644 --- a/utils/file.go +++ b/utils/file.go @@ -30,7 +30,7 @@ func FileExists(name string) bool { // search a file in paths. // this is offen used in search config file in /etc ~/ -func LookFile(filename string, paths ...string) (fullpath string, err error) { +func SearchFile(filename string, paths ...string) (fullpath string, err error) { for _, path := range paths { if fullpath = filepath.Join(path, filename); FileExists(fullpath) { return @@ -41,7 +41,7 @@ func LookFile(filename string, paths ...string) (fullpath string, err error) { } // like command grep -E -// for example: GrepE(`^hello`, "hello.txt") +// for example: GrepFile(`^hello`, "hello.txt") // \n is striped while read func GrepFile(patten string, filename string) (lines []string, err error) { re, err := regexp.Compile(patten) diff --git a/utils/file_test.go b/utils/file_test.go index a213d765..c183484b 100644 --- a/utils/file_test.go +++ b/utils/file_test.go @@ -23,7 +23,7 @@ func TestSelfDir(t *testing.T) { func TestFileExists(t *testing.T) { if !FileExists("./file.go") { - t.Errorf("/bin/echo should exists, but it didn't") + t.Errorf("./file.go should exists, but it didn't") } if FileExists(noExistedFile) { @@ -31,14 +31,14 @@ func TestFileExists(t *testing.T) { } } -func TestLookFile(t *testing.T) { - path, err := LookFile(filepath.Base(SelfPath()), SelfDir()) +func TestSearchFile(t *testing.T) { + path, err := SearchFile(filepath.Base(SelfPath()), SelfDir()) if err != nil { t.Error(err) } t.Log(path) - path, err = LookFile(noExistedFile, ".") + path, err = SearchFile(noExistedFile, ".") if err == nil { t.Errorf("err shouldnot be nil, got path: %s", SelfDir()) }