Merge pull request #39 from FlowCI/develop

Develop

Author: gy2006

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+*.exe
 flow-agent-x
 vendor/
 .idea/

app.go

@@ -20,7 +20,7 @@ import (
 	"github.com/urfave/cli"
 )
 
-const version = "0.20.40"
+const version = "0.20.45"
 
 func init() {
 	util.LogInit()
@@ -69,7 +69,7 @@ func main() {
 
 		cli.StringFlag{
 			Name:   "workspace, w",
-			Value:  filepath.Join("${HOME}", ".flow.ci.agent"),
+			Value:  filepath.Join(util.HomeDir, ".flow.ci.agent"),
 			Usage:  "Agent working directory",
 			EnvVar: domain.VarAgentWorkspace,
 		},
@@ -159,7 +159,7 @@ func printInfo() {
 func execCmd(script string) {
 	cmd := &domain.ShellIn{
 		ID:      "local",
-		Scripts: []string{script},
+		Bash:    []string{script},
 		Inputs:  domain.Variables{},
 		Timeout: 1800,
 	}

domain/cmd_shell.go

@@ -14,7 +14,9 @@ type (
 		AllowFailure bool            `json:"allowFailure"`
 		Plugin       string          `json:"plugin"`
 		Dockers      []*DockerOption `json:"dockers"`
-		Scripts      []string        `json:"scripts"`
+		Bash         []string        `json:"bash"`
+		Pwsh         []string        `json:"pwsh"`
+		Retry        int             `json:"retry"`
 		Timeout      int             `json:"timeout"`
 		Inputs       Variables       `json:"inputs"`
 		EnvFilters   []string        `json:"envFilters"`
@@ -52,14 +54,6 @@ func (in *ShellIn) HasDockerOption() bool {
 	return in.Dockers != nil && len(in.Dockers) > 0
 }
 
-func (in *ShellIn) HasScripts() bool {
-	if in.Scripts == nil {
-		return false
-	}
-
-	return len(in.Scripts) != 0
-}
-
 func (in *ShellIn) HasEnvFilters() bool {
 	if in.EnvFilters == nil {
 		return false