From 1b4ed34a5ab493f14494304904da5a553cc4980b Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 3 May 2017 14:42:06 +0200 Subject: Split path --- file/names.go | 7 ++++--- file/names_test.go | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'file') diff --git a/file/names.go b/file/names.go index 2e90e7b..5b2287c 100644 --- a/file/names.go +++ b/file/names.go @@ -18,11 +18,12 @@ const ( ) func splitNameExt(fname string) (string, string) { - ext := filepath.Ext(fname) + _, file := path.Split(fname) + ext := filepath.Ext(file) if len(ext) == 0 { - return fname, "" + return file, "" } - return fname[:len(fname)-len(ext)], ext + return file[:len(file)-len(ext)], ext } func Names(pubFile, encFile string) error { diff --git a/file/names_test.go b/file/names_test.go index f4d474b..38e374d 100644 --- a/file/names_test.go +++ b/file/names_test.go @@ -52,6 +52,7 @@ func TestSplit(t *testing.T) { {".pub", "", ".pub"}, {".testkey.pub", ".testkey", ".pub"}, {"", "", ""}, + {"path/key.pub", "key", ".pub"}, } for _, tc := range testCases { t.Run(tc.fname, func(t *testing.T) { -- cgit v1.2.3