Use filepath.Join when applicable

5 files changed, 25 insertions, 23 deletions

diff --git a/beku.go b/beku.go
index 3f079a0..a52fbb6 100644
--- a/beku.go
+++ b/beku.go
@@ -17,7 +17,7 @@ const (
 	dbgSkipSelf = "skip self dep"
 	dbgSkipStd  = "skip std dep"
 
-	dirDB       = "/var/beku"
+	dirDB       = "var/beku"
 	dirBin      = "bin"
 	dirPkg      = "pkg"
 	dirSrc      = "src"
diff --git a/env.go b/env.go
index 8f1816b..e0889e2 100644
--- a/env.go
+++ b/env.go
@@ -55,12 +55,12 @@ func NewEnvironment() (env *Env, err error) {
 	Debug = debugMode(debug)
 
 	env = &Env{
-		dirSrc:     build.Default.GOPATH + "/" + dirSrc,
-		dirRootSrc: build.Default.GOROOT + "/" + dirSrc,
-		dirBin:     build.Default.GOPATH + "/" + dirBin,
-		dirPkg: build.Default.GOPATH + "/" + dirPkg + "/" +
-			build.Default.GOOS + "_" + build.Default.GOARCH,
-		dbDefFile: build.Default.GOPATH + dirDB + "/" + DefDBName,
+		dirSrc:     filepath.Join(build.Default.GOPATH, dirSrc),
+		dirRootSrc: filepath.Join(build.Default.GOROOT, dirSrc),
+		dirBin:     filepath.Join(build.Default.GOPATH, dirBin),
+		dirPkg: filepath.Join(build.Default.GOPATH, dirPkg,
+			build.Default.GOOS+"_"+build.Default.GOARCH),
+		dbDefFile: filepath.Join(build.Default.GOPATH, dirDB, DefDBName),
 	}
 
 	err = env.scanStdPackages(env.dirRootSrc)
@@ -133,7 +133,7 @@ func (env *Env) scanStdPackages(srcPath string) error {
 		}
 
 		dirName := fi.Name()
-		fullPath := srcPath + "/" + dirName
+		fullPath := filepath.Join(srcPath, dirName)
 
 		// (1)
 		if IsIgnoredDir(dirName) {
@@ -175,8 +175,8 @@ func (env *Env) scanPackages(rootPath string) (err error) {
 		}
 
 		dirName := fi.Name()
-		fullPath := rootPath + "/" + dirName
-		dirGit := fullPath + "/" + gitDir
+		fullPath := filepath.Join(rootPath, dirName)
+		dirGit := filepath.Join(fullPath, gitDir)
 
 		// (1)
 		if IsIgnoredDir(dirName) {
@@ -284,7 +284,7 @@ func (env *Env) Load(file string) (err error) {
 
 		pkg := &Package{
 			ImportPath: sec.Sub,
-			FullPath:   env.dirSrc + "/" + sec.Sub,
+			FullPath:   filepath.Join(env.dirSrc, sec.Sub),
 		}
 
 		pkg.load(sec)
diff --git a/package.go b/package.go
index 4c03efc..0c923f2 100644
--- a/package.go
+++ b/package.go
@@ -11,6 +11,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"sort"
 	"strings"
 
@@ -44,7 +45,7 @@ func NewPackage(pkgName, importPath string, vcsMode VCSMode) (
 	pkg = &Package{
 		ImportPath: importPath,
 		RemoteURL:  "https://" + pkgName,
-		FullPath:   build.Default.GOPATH + "/" + dirSrc + "/" + importPath,
+		FullPath:   filepath.Join(build.Default.GOPATH, dirSrc, importPath),
 		vcs:        vcsMode,
 	}
 
diff --git a/package_git.go b/package_git.go
index ee46d39..8f43b47 100644
--- a/package_git.go
+++ b/package_git.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"path/filepath"
 
 	"github.com/shuLhan/share/lib/ini"
 )
@@ -105,7 +106,7 @@ func (pkg *Package) gitFetch() (err error) {
 	if pkg.isTag {
 		pkg.VersionNext, err = pkg.gitGetTagLatest()
 	} else {
-		ref := pkg.RemoteName + "/" + gitDefBranch
+		ref := filepath.Join(pkg.RemoteName, gitDefBranch)
 		pkg.VersionNext, err = pkg.gitGetCommit(ref)
 	}
 
@@ -267,7 +268,7 @@ func (pkg *Package) gitScan() (err error) {
 }
 
 func (pkg *Package) gitScanRemote() (err error) {
-	gitConfig := pkg.FullPath + "/" + gitDir + "/config"
+	gitConfig := filepath.Join(pkg.FullPath, gitDir, "config")
 
 	gitIni, err := ini.Open(gitConfig)
 	if err != nil {
diff --git a/package_test.go b/package_test.go
index 993e5a9..611dec5 100644
--- a/package_test.go
+++ b/package_test.go
@@ -530,21 +530,21 @@ func testUpdate(t *testing.T) {
 		curPkg: &Package{
 			vcs:        VCSModeGit,
 			ImportPath: testGitRepo,
-			FullPath:   testEnv.dirSrc + "/" + testGitRepo,
+			FullPath:   filepath.Join(testEnv.dirSrc, testGitRepo),
 			RemoteName: gitDefRemoteName,
 			RemoteURL:  "https://" + testGitRepo,
 		},
 		newPkg: &Package{
 			vcs:        VCSModeGit,
 			ImportPath: testGitRepo,
-			FullPath:   testEnv.dirSrc + "/" + testGitRepo,
+			FullPath:   filepath.Join(testEnv.dirSrc, testGitRepo),
 			RemoteName: gitDefRemoteName,
 			RemoteURL:  "git@github.com:shuLhan/beku_test.git",
 		},
 		expPkg: &Package{
 			vcs:        VCSModeGit,
 			ImportPath: testGitRepo,
-			FullPath:   testEnv.dirSrc + "/" + testGitRepo,
+			FullPath:   filepath.Join(testEnv.dirSrc, testGitRepo),
 			RemoteName: gitDefRemoteName,
 			RemoteURL:  "git@github.com:shuLhan/beku_test.git",
 		},
@@ -553,14 +553,14 @@ func testUpdate(t *testing.T) {
 		curPkg: &Package{
 			vcs:        VCSModeGit,
 			ImportPath: testGitRepo,
-			FullPath:   testEnv.dirSrc + "/" + testGitRepo,
+			FullPath:   filepath.Join(testEnv.dirSrc, testGitRepo),
 			RemoteName: gitDefRemoteName,
 			RemoteURL:  "https://" + testGitRepo,
 		},
 		newPkg: &Package{
 			vcs:        VCSModeGit,
 			ImportPath: testGitRepo,
-			FullPath:   testEnv.dirSrc + "/" + testGitRepo,
+			FullPath:   filepath.Join(testEnv.dirSrc, testGitRepo),
 			RemoteName: gitDefRemoteName,
 			RemoteURL:  "git@github.com:shuLhan/beku_test.git",
 			Version:    "v0.1.0",
@@ -569,7 +569,7 @@ func testUpdate(t *testing.T) {
 		expPkg: &Package{
 			vcs:        VCSModeGit,
 			ImportPath: testGitRepo,
-			FullPath:   testEnv.dirSrc + "/" + testGitRepo,
+			FullPath:   filepath.Join(testEnv.dirSrc, testGitRepo),
 			RemoteName: gitDefRemoteName,
 			RemoteURL:  "git@github.com:shuLhan/beku_test.git",
 			Version:    "v0.1.0",
@@ -580,14 +580,14 @@ func testUpdate(t *testing.T) {
 		curPkg: &Package{
 			vcs:        VCSModeGit,
 			ImportPath: testGitRepo,
-			FullPath:   testEnv.dirSrc + "/" + testGitRepo,
+			FullPath:   filepath.Join(testEnv.dirSrc, testGitRepo),
 			RemoteName: gitDefRemoteName,
 			RemoteURL:  "https://" + testGitRepo,
 		},
 		newPkg: &Package{
 			vcs:        VCSModeGit,
 			ImportPath: testGitRepo,
-			FullPath:   testEnv.dirSrc + "/" + testGitRepo,
+			FullPath:   filepath.Join(testEnv.dirSrc, testGitRepo),
 			RemoteName: gitDefRemoteName,
 			RemoteURL:  "git@github.com:shuLhan/beku_test.git",
 			Version:    "c9f69fb",
@@ -596,7 +596,7 @@ func testUpdate(t *testing.T) {
 		expPkg: &Package{
 			vcs:        VCSModeGit,
 			ImportPath: testGitRepo,
-			FullPath:   testEnv.dirSrc + "/" + testGitRepo,
+			FullPath:   filepath.Join(testEnv.dirSrc, testGitRepo),
 			RemoteName: gitDefRemoteName,
 			RemoteURL:  "git@github.com:shuLhan/beku_test.git",
 			Version:    "c9f69fb",