rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-02 01:31:48 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1012 from joshwget/merge-input-flag

Browse Source 
Add --input flag to ros config merge
This commit is contained in:
Darren Shepherd 2016-06-14 15:46:14 -07:00 committed by GitHub
commit 82ca0def35
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/control/config.go
View File

@ -69,6 +69,12 @@ func configSubcommands() []cli.Command {
Name: "merge",
Usage: "merge configuration from stdin",
Action: merge,
Flags: []cli.Flag{
cli.StringFlag{
Name: "input, i",
Usage: "File from which to read",
},
},
},
}
}
@ -180,13 +186,23 @@ func configGet(c *cli.Context) error {
}
func merge(c *cli.Context) error {
bytes, err := ioutil.ReadAll(os.Stdin)
input := os.Stdin
inputFile := c.String("input")
if inputFile != "" {
var err error
input, err = os.Open(inputFile)
if err != nil {
log.Fatal(err)
}
defer input.Close()
}
bytes, err := ioutil.ReadAll(input)
if err != nil {
log.Fatal(err)
}
err = config.Merge(bytes)
if err != nil {
if err = config.Merge(bytes); err != nil {
log.Fatal(err)
}