Skip to content

Commit cf9e5d4

Browse files
ref(*): rewrite to use path/filepath for better OS compatibility
1 parent 434681e commit cf9e5d4

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

client/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/http"
88
"net/url"
99
"os"
10-
"path"
10+
"path/filepath"
1111
)
1212

1313
// Client oversees the interaction between the client and controller
@@ -94,7 +94,7 @@ func (c Client) Save() error {
9494
return err
9595
}
9696

97-
if err = os.MkdirAll(path.Join(FindHome(), "/.deis/"), 0775); err != nil {
97+
if err = os.MkdirAll(filepath.Join(FindHome(), "/.deis/"), 0775); err != nil {
9898
return err
9999
}
100100

client/client_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"io/ioutil"
55
"net/url"
66
"os"
7-
"path"
7+
"path/filepath"
88
"testing"
99
)
1010

@@ -19,12 +19,12 @@ func createTempProfile(contents string) error {
1919

2020
os.Unsetenv("DEIS_PROFILE")
2121
os.Setenv("HOME", name)
22-
folder := path.Join(name, "/.deis/")
22+
folder := filepath.Join(name, ".deis")
2323
if err = os.Mkdir(folder, 0755); err != nil {
2424
return err
2525
}
2626

27-
if err = ioutil.WriteFile(path.Join(folder, "client.json"), []byte(contents), 0775); err != nil {
27+
if err = ioutil.WriteFile(filepath.Join(folder, "client.json"), []byte(contents), 0775); err != nil {
2828
return err
2929
}
3030

client/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package client
33
import (
44
"fmt"
55
"os"
6-
"path"
6+
"path/filepath"
77

88
"github.com/deis/workflow-cli/version"
99
)
@@ -15,7 +15,7 @@ func locateSettingsFile() string {
1515
filename = "client"
1616
}
1717

18-
return path.Join(FindHome(), ".deis", filename+".json")
18+
return filepath.Join(FindHome(), ".deis", filename+".json")
1919
}
2020

2121
func checkAPICompatibility(serverAPIVersion string) {

client/utils_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// +build linux darwin
2+
13
package client
24

35
import (

0 commit comments

Comments
 (0)