vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

beam/examples/beamsh: support for background commands with '&' terminator

Browse source 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
This commit is contained in:
Solomon Hykes 2014-03-27 18:26:42 -07:00
parent 086724e1a3
commit 529e741f08
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dockerscript/dockerscript.go
View file

@ -10,6 +10,7 @@ import (
type Command struct {
Args []string
Children []*Command
Background bool
}
type Scanner struct {
@ -72,7 +73,7 @@ func parseArgs(s *Scanner) ([]string, rune, error) {
return args, tok, nil
}
if !s.commentLine {
if text == "{" || text == "}" || text == "\n" || text == "\r" || text == ";" {
if text == "{" || text == "}" || text == "\n" || text == "\r" || text == ";" || text == "&" {
return args, tok, nil
}
args = append(args, text)
@ -106,6 +107,8 @@ func parse(s *Scanner, opener string) (expr []*Command, err error) {
cmd.Children = children
} else if afterArgs == "}" && opener != "{" {
return nil, fmt.Errorf("unexpected end of block '}'")
} else if afterArgs == "&" {
cmd.Background = true
}
if len(cmd.Args) > 0 || len(cmd.Children) > 0 {
expr = append(expr, cmd)