Compare commits

...

2 Commits

Author SHA1 Message Date
Minghe Huang
df64c02b16 bump up version 2020-03-01 15:43:24 +08:00
Minghe Huang
27a2113d30 fix the wrong destination of copy issue 2020-03-01 15:40:04 +08:00
2 changed files with 14 additions and 2 deletions

2
fx.go
View File

@@ -17,7 +17,7 @@ import (
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
)
const version = "0.9.1"
const version = "0.9.2"
func init() {
go checkForUpdate()

View File

@@ -149,9 +149,21 @@ func merge(dest string, input ...string) error {
return err
}
if err := copy.Copy(file, dest); err != nil {
stat, err := os.Stat(path)
if err != nil {
return err
}
if stat.Mode().IsRegular() {
destDir := filepath.Join(dest, filepath.Dir(path))
if err := utils.EnsureDir(destDir); err != nil {
return err
}
if err := copy.Copy(file, destDir); err != nil {
return err
}
}
return nil
}); err != nil {
return err