Merge pull request #2 from IvanDmytrenko/master

Use stdlib join for file paths instead of concatenation
golobby · Jan 28, 2020 · 76441a8 · 76441a8
2 parents 7d7de7d + 6aaa5f6
commit 76441a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/env/env.go b/env/env.go
@@ -6,6 +6,7 @@ import (
 	"bufio"
 	"errors"
 	"os"
+	"path/filepath"
 	"strings"
 )
 
@@ -16,7 +17,7 @@ func Load(filename string) (map[string]string, error) {
 		return nil, err
 	}
 
-	path := wd + string(os.PathSeparator) + filename
+	path := filepath.Join(wd, string(filepath.Separator), filename)
 	file, err := os.Open(path)
 	if err != nil {
 		return nil, err

diff --git a/feeder/json_directory.go b/feeder/json_directory.go
@@ -2,7 +2,7 @@ package feeder
 
 import (
 	"io/ioutil"
-	"os"
+	"path/filepath"
 	"strings"
 )
 
@@ -25,7 +25,7 @@ func (jd JsonDirectory) Feed() (map[string]interface{}, error) {
 			continue
 		}
 
-		j := Json{Path: jd.Path + string(os.PathSeparator) + f.Name()}
+		j := Json{Path: filepath.Join(jd.Path, string(filepath.Separator), f.Name())}
 
 		items, err := j.Feed()
 		if err != nil {