Merge PR #4433: Adopt YAML as human-readable text output
This commit is contained in:
committed by
Alexander Bezobchuk
parent
9969ef9b19
commit
e9810ac25c
+12
-6
@@ -6,6 +6,7 @@ import (
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/spf13/viper"
|
||||
"gopkg.in/yaml.v2"
|
||||
|
||||
"github.com/tendermint/tendermint/libs/cli"
|
||||
)
|
||||
@@ -28,16 +29,21 @@ var Cmd = &cobra.Command{
|
||||
return nil
|
||||
}
|
||||
|
||||
if viper.GetString(cli.OutputFlag) != "json" {
|
||||
fmt.Println(verInfo)
|
||||
return nil
|
||||
var bz []byte
|
||||
var err error
|
||||
|
||||
switch viper.GetString(cli.OutputFlag) {
|
||||
case "json":
|
||||
bz, err = json.Marshal(verInfo)
|
||||
default:
|
||||
bz, err = yaml.Marshal(&verInfo)
|
||||
}
|
||||
|
||||
bz, err := json.Marshal(verInfo)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Println(string(bz))
|
||||
return nil
|
||||
|
||||
_, err = fmt.Println(string(bz))
|
||||
return err
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user