Skip to content

Commit

Permalink
Stop linkerd from creating folder during get.sh
Browse files Browse the repository at this point in the history
Fixes an issue seen by Kah Keng Tay and "Joe" whilst trying
the workshop.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
  • Loading branch information
alexellis committed Mar 4, 2020
1 parent 4def417 commit 9f4f0dc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/apps/linkerd_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ func getUserPath() (string, error) {
}

func getExportPath() string {
userPath, _ := getUserPath()
userPath := config.GetUserDir()
return path.Join(userPath, "bin/")
}

Expand Down
6 changes: 6 additions & 0 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ import (
// K3sVersion default version
const K3sVersion = "v1.17.2+k3s1"

func GetUserDir() string {
home := os.Getenv("HOME")
root := fmt.Sprintf("%s/.arkade/", home)
return root
}

func InitUserDir() (string, error) {
home := os.Getenv("HOME")
root := fmt.Sprintf("%s/.arkade/", home)
Expand Down

0 comments on commit 9f4f0dc

Please sign in to comment.