[camel-k] 02/03: Changes requested

[tsato]

This is an automated email from the ASF dual-hosted git repository.

tsato pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 4dcda1bb54e414ec95b04453863bcce7f503e717
Author: Adriano Machado <unknown>
AuthorDate: Thu Jun 16 08:44:42 2022 -0400

    Changes requested
---
 pkg/cmd/util_commands.go           | 10 ++--------
 pkg/resources/resources_support.go | 18 +++++++-----------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkg/cmd/util_commands.go b/pkg/cmd/util_commands.go
index 04a189fce..7f0252a3f 100644
--- a/pkg/cmd/util_commands.go
+++ b/pkg/cmd/util_commands.go
@@ -21,8 +21,8 @@ import (
        "context"
        "fmt"
        "io"
+       "os"
        "os/exec"
-       "runtime"
        "strings"
 
        "github.com/apache/camel-k/pkg/util"
@@ -50,13 +50,7 @@ func assembleClasspathArgValue(properties []string, 
dependencies []string, route
        classpathContents = append(classpathContents, properties...)
        classpathContents = append(classpathContents, routes...)
        classpathContents = append(classpathContents, dependencies...)
-
-       pathSeparator := ":"
-       if runtime.GOOS == "windows" {
-               pathSeparator = ";"
-       }
-
-       return strings.Join(classpathContents, pathSeparator)
+       return strings.Join(classpathContents, string(os.PathListSeparator))
 }
 
 func assembleIntegrationRunCommand(ctx context.Context, properties []string, 
dependencies []string, routes []string, propertiesDir string, stdout, stderr 
io.Writer, local bool) (*exec.Cmd, error) {
diff --git a/pkg/resources/resources_support.go 
b/pkg/resources/resources_support.go
index 167ccce13..684fab2f9 100644
--- a/pkg/resources/resources_support.go
+++ b/pkg/resources/resources_support.go
@@ -20,9 +20,9 @@ package resources
 import (
        "bytes"
        "io/ioutil"
+       "net/http"
        "os"
        "path/filepath"
-       "runtime"
        "strings"
        "text/template"
 
@@ -47,7 +47,7 @@ func Resource(name string) ([]byte, error) {
                name = "/" + name
        }
 
-       file, err := assets.Open(fixPath(name))
+       file, err := openAsset(name)
        if err != nil {
                return nil, errors.Wrapf(err, "cannot access resource file %s", 
name)
        }
@@ -86,7 +86,7 @@ func TemplateResource(name string, params interface{}) 
(string, error) {
 
 // DirExists tells if a directory exists and can be listed for files.
 func DirExists(dirName string) bool {
-       if _, err := assets.Open(fixPath(dirName)); err != nil {
+       if _, err := openAsset(dirName); err != nil {
                return false
        }
        return true
@@ -104,7 +104,7 @@ func WithPrefix(pathPrefix string) ([]string, error) {
 
        var res []string
        for i := range paths {
-               path := fixPath(paths[i])
+               path := filepath.FromSlash(paths[i])
                if result, _ := filepath.Match(pathPrefix+"*", path); result {
                        res = append(res, path)
                }
@@ -115,7 +115,7 @@ func WithPrefix(pathPrefix string) ([]string, error) {
 
 // Resources lists all file names in the given path (starts with '/').
 func Resources(dirName string) ([]string, error) {
-       dir, err := assets.Open(fixPath(dirName))
+       dir, err := openAsset(dirName)
        if err != nil {
                if os.IsNotExist(err) {
                        return nil, nil
@@ -149,10 +149,6 @@ func Resources(dirName string) ([]string, error) {
        return res, dir.Close()
 }
 
-func fixPath(path string) string {
-       if runtime.GOOS == "windows" {
-               path = strings.ReplaceAll(path, "\\", "/")
-       }
-
-       return path
+func openAsset(path string) (http.File, error) {
+       return assets.Open(filepath.FromSlash(path))
 }