lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-06-25 03:24:12 +00:00
Code Issues Releases Activity

add arguments support

Browse Source
This commit is contained in:
borisborshevsky 2017-03-22 15:57:25 +02:00
parent 69023e9ae0
commit 95f67cb3ce
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/commands/rs/rs.go
View File

@ -22,6 +22,8 @@ import (
"runtime" "runtime"
"time" "time"
"strings"
"github.com/beego/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/beego/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
"github.com/beego/bee/config" "github.com/beego/bee/config"
@ -36,7 +38,7 @@ var cmdRs = &commands.Command{
Long: `Run script allows you to run arbitrary commands using Bee. Long: `Run script allows you to run arbitrary commands using Bee.
Custom commands are provided from the "scripts" object inside bee.json or Beefile. Custom commands are provided from the "scripts" object inside bee.json or Beefile.
To run a custom command, use: {{"$ bee rs mycmd" | bold}} To run a custom command, use: {{"$ bee rs mycmd ARGS" | bold}}
{{if len .}} {{if len .}}
{{"AVAILABLE SCRIPTS"|headline}}{{range $cmdName, $cmd := .}} {{"AVAILABLE SCRIPTS"|headline}}{{range $cmdName, $cmd := .}}
{{$cmdName | printf "-%s" | bold}} {{$cmdName | printf "-%s" | bold}}
@ -58,18 +60,19 @@ func runScript(cmd *commands.Command, args []string) int {
} }
start := time.Now() start := time.Now()
for _, arg := range args { script, args := args[0], args[1:]
if c, exist := config.Conf.Scripts[arg]; exist {
command := customCommand{ if c, exist := config.Conf.Scripts[script]; exist {
Name: arg, command := customCommand{
Command: c, Name: script,
} Command: c,
if err := command.run(); err != nil { Args: args,
beeLogger.Log.Error(err.Error())
}
} else {
beeLogger.Log.Errorf("Command '%s' not found in Beefile/bee.json", arg)
} }
if err := command.run(); err != nil {
beeLogger.Log.Error(err.Error())
}
} else {
beeLogger.Log.Errorf("Command '%s' not found in Beefile/bee.json", script)
} }
elapsed := time.Since(start) elapsed := time.Since(start)
fmt.Println(colors.GreenBold(fmt.Sprintf("Finished in %s.", elapsed))) fmt.Println(colors.GreenBold(fmt.Sprintf("Finished in %s.", elapsed)))
@ -79,6 +82,7 @@ func runScript(cmd *commands.Command, args []string) int {
type customCommand struct { type customCommand struct {
Name string Name string
Command string Command string
Args []string
} }
func (c *customCommand) run() error { func (c *customCommand) run() error {
@ -86,9 +90,11 @@ func (c *customCommand) run() error {
var cmd *exec.Cmd var cmd *exec.Cmd
switch runtime.GOOS { switch runtime.GOOS {
case "darwin", "linux": case "darwin", "linux":
cmd = exec.Command("sh", "-c", c.Command) args := append([]string{c.Command}, c.Args...)
cmd = exec.Command("bash", "-c", strings.Join(args, " "))
case "windows": case "windows":
cmd = exec.Command("cmd", "/C", c.Command) args := append([]string{c.Command}, c.Args...)
cmd = exec.Command("cmd", "/C", strings.Join(args, " "))
} }
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr