From ea1fe05d88e0de0e7a020208b2875b559b5b1ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= <unguiculus@gmail.com>
Date: Mon, 2 Nov 2020 08:27:38 +0100
Subject: [PATCH] Consistently use filepath package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Usage of filepath vs. path seems to have been pretty random.
With this change, we consistently use filepath which considers
the platform-specific path separator.

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>
---
 pkg/config/config.go |  6 +++---
 pkg/util/util.go     | 13 ++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index eaf3a030..10a6e2c7 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -17,7 +17,7 @@ package config
 import (
 	"fmt"
 	"os"
-	"path"
+	"path/filepath"
 	"reflect"
 	"strings"
 
@@ -34,7 +34,7 @@ var (
 	homeDir, _            = homedir.Dir()
 	configSearchLocations = []string{
 		".",
-		path.Join(homeDir, ".ct"),
+		filepath.Join(homeDir, ".ct"),
 		"/usr/local/etc/ct",
 		"/etc/ct",
 	}
@@ -183,7 +183,7 @@ func printCfg(cfg *Configuration) {
 
 func findConfigFile(fileName string) (string, error) {
 	for _, location := range configSearchLocations {
-		filePath := path.Join(location, fileName)
+		filePath := filepath.Join(location, fileName)
 		if util.FileExists(filePath) {
 			return filePath, nil
 		}
diff --git a/pkg/util/util.go b/pkg/util/util.go
index 89ba2776..c0405212 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -21,7 +21,6 @@ import (
 	"math/rand"
 	"net"
 	"os"
-	"path"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -115,7 +114,7 @@ func (l DirectoryLister) ListChildDirs(parentDir string, test func(dir string) b
 	var dirs []string
 	for _, dir := range fileInfos {
 		dirName := dir.Name()
-		parentSlashChildDir := path.Join(parentDir, dirName)
+		parentSlashChildDir := filepath.Join(parentDir, dirName)
 		if test(parentSlashChildDir) {
 			dirs = append(dirs, parentSlashChildDir)
 		}
@@ -130,8 +129,8 @@ func (u ChartUtils) LookupChartDir(chartDirs []string, dir string) (string, erro
 	for _, chartDir := range chartDirs {
 		currentDir := dir
 		for {
-			chartYaml := path.Join(currentDir, "Chart.yaml")
-			parent := path.Dir(path.Dir(chartYaml))
+			chartYaml := filepath.Join(currentDir, "Chart.yaml")
+			parent := filepath.Dir(filepath.Dir(chartYaml))
 			chartDir = strings.TrimRight(chartDir, "/") // remove any trailing slash from the dir
 
 			// check directory has a Chart.yaml and that it is in a
@@ -140,9 +139,9 @@ func (u ChartUtils) LookupChartDir(chartDirs []string, dir string) (string, erro
 				return currentDir, nil
 			}
 
-			currentDir = path.Dir(currentDir)
+			currentDir = filepath.Dir(currentDir)
 			relativeDir, _ := filepath.Rel(chartDir, currentDir)
-			joined := path.Join(chartDir, relativeDir)
+			joined := filepath.Join(chartDir, relativeDir)
 			if (joined == chartDir) || strings.HasPrefix(relativeDir, "..") {
 				break
 			}
@@ -155,7 +154,7 @@ func (u ChartUtils) LookupChartDir(chartDirs []string, dir string) (string, erro
 // and return a newly allocated ChartYaml object. If no Chart.yaml is present
 // or there is an error unmarshaling the file contents, an error will be returned.
 func ReadChartYaml(dir string) (*ChartYaml, error) {
-	yamlBytes, err := ioutil.ReadFile(path.Join(dir, "Chart.yaml"))
+	yamlBytes, err := ioutil.ReadFile(filepath.Join(dir, "Chart.yaml"))
 	if err != nil {
 		return nil, errors.Wrap(err, "Could not read 'Chart.yaml'")
 	}