dapr
/
cli
mirror of https://github.com/dapr/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changes to fix the homepath dir on windows

This commit is contained in:
Vinaya Damle 2020-05-29 12:05:46 -07:00
parent 8df8a716ca
commit 9fee955548
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/standalone/common.go Normal file
View File

@ -0,0 +1,20 @@
package standalone
import (
"os"
path_filepath "path/filepath"
"runtime"
)
// getDefaultComponentsFolder returns the hidden .components folder created under install directory at init time
func getDefaultComponentsFolder() string {
const daprDirName = ".dapr"
const componentsDirName = "components"
daprDirPath := os.Getenv("HOME")
if runtime.GOOS == daprWindowsOS {
daprDirPath = path_filepath.Join(os.Getenv("HOMEDRIVE"), os.Getenv("HOMEPATH"))
}
defaultComponentsPath := path_filepath.Join(daprDirPath, daprDirName, componentsDirName)
return defaultComponentsPath
}

3
pkg/standalone/run.go
View File

@ -19,7 +19,6 @@ import (
"github.com/Pallinder/sillyname-go" "github.com/Pallinder/sillyname-go"
"github.com/phayes/freeport" "github.com/phayes/freeport"
"github.com/dapr/cli/utils"
"github.com/dapr/dapr/pkg/components" "github.com/dapr/dapr/pkg/components"
modes "github.com/dapr/dapr/pkg/config/modes" modes "github.com/dapr/dapr/pkg/config/modes"
) )
@ -347,7 +346,7 @@ func Run(config *RunConfig) (*RunOutput, error) {
func getComponentsPath(config *RunConfig) (string, error) { func getComponentsPath(config *RunConfig) (string, error) {
if config.ComponentsPath == "" { if config.ComponentsPath == "" {
componentsPath := utils.GetDefaultComponentsFolder() componentsPath := getDefaultComponentsFolder()
fmt.Println("Read components: ", componentsPath) fmt.Println("Read components: ", componentsPath)
return componentsPath, nil return componentsPath, nil
} }

2
pkg/standalone/standalone.go
View File

@ -393,7 +393,7 @@ func createComponentsDir(wg *sync.WaitGroup, errorChan chan<- error, dir, versio
defer wg.Done() defer wg.Done()
// Make default components directory under install path // Make default components directory under install path
componentsDir := utils.GetDefaultComponentsFolder() componentsDir := getDefaultComponentsFolder()
fmt.Println("Creating default components dir: ", componentsDir) fmt.Println("Creating default components dir: ", componentsDir)
_, err := os.Stat(componentsDir) _, err := os.Stat(componentsDir)
if os.IsNotExist(err) { if os.IsNotExist(err) {

2
pkg/standalone/uninstall.go
View File

@ -50,7 +50,7 @@ func removeContainers(uninstallAll bool, dockerNetwork string) []error {
} }
func removeDefaultComponentsFolder() error { func removeDefaultComponentsFolder() error {
defaultComponentsPath := utils.GetDefaultComponentsFolder() defaultComponentsPath := getDefaultComponentsFolder()
fmt.Println("Cleaning up default Components folder: ", defaultComponentsPath) fmt.Println("Cleaning up default Components folder: ", defaultComponentsPath)
err := os.RemoveAll(defaultComponentsPath) err := os.RemoveAll(defaultComponentsPath)

11
utils/utils.go
View File

@ -13,7 +13,6 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
path_filepath "path/filepath"
"strings" "strings"
"github.com/docker/docker/client" "github.com/docker/docker/client"
@ -122,13 +121,3 @@ func IsDockerInstalled() bool {
_, err = cli.Ping(context.Background()) _, err = cli.Ping(context.Background())
return err == nil return err == nil
} }
// GetDefaultComponentsFolder returns the hidden .components folder created under install directory at init time
func GetDefaultComponentsFolder() string {
const daprDirName = ".dapr"
const componentsDirName = "components"
daprDirPath := os.Getenv("HOME")
defaultComponentsPath := path_filepath.Join(daprDirPath, daprDirName, componentsDirName)
return defaultComponentsPath
}