Skip to content

Commit 4f81b5f

Browse files
authored
Merge pull request #99 from zeropsio/z1840
z1840 - fix project import on windows
2 parents 522b3a8 + c0c5cdb commit 4f81b5f

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [v0.12.12] - 2022-10-06
8+
9+
### Fixed
10+
- project import on windows
11+
712
## [v0.12.11] - 2022-09-30
813

914
### Fixed

src/cliAction/importProjectService/yamlContent.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"errors"
55
"fmt"
66
"os"
7-
"path"
87
"path/filepath"
98

109
"github.com/zeropsio/zcli/src/constants"
@@ -19,7 +18,7 @@ func getImportYamlContent(config RunConfig) ([]byte, error) {
1918
return nil, err
2019
}
2120

22-
importYamlPath := path.Join(workingDir, config.ImportYamlPath)
21+
importYamlPath := filepath.Join(workingDir, config.ImportYamlPath)
2322

2423
fileInfo, err := os.Stat(importYamlPath)
2524
if err != nil {

src/constants/params.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package constants
22

33
import (
44
"os"
5-
"path"
5+
"path/filepath"
66
)
77

88
func CliLoginData() (string, error) {
@@ -22,5 +22,5 @@ func cliStorageFilepath(filename string) (string, error) {
2222
if err != nil {
2323
return "", err
2424
}
25-
return path.Join(configDir, "zerops", filename), nil
25+
return filepath.Join(configDir, "zerops", filename), nil
2626
}

0 commit comments

Comments
 (0)