@@ -30,13 +30,6 @@ func main() {
30
30
},
31
31
}
32
32
app .Action = readProperty
33
- app .Flags = []cli.Flag {
34
- cli.StringFlag {
35
- Name : "trim, t" ,
36
- Value : "true" ,
37
- Usage : "trim output" ,
38
- },
39
- }
40
33
app .Run (os .Args )
41
34
}
42
35
@@ -47,13 +40,13 @@ func readProperty(c *cli.Context) {
47
40
readYaml (c , & parsedData )
48
41
49
42
if len (c .Args ()) == 1 {
50
- printYaml (parsedData , c . Bool ( "trim" ) )
43
+ printYaml (parsedData )
51
44
os .Exit (0 )
52
45
}
53
46
54
47
var paths = parsePath (c .Args ()[1 ])
55
48
56
- printYaml (readMap (parsedData , paths [0 ], paths [1 :len (paths )]), c . Bool ( "trim" ) )
49
+ printYaml (readMap (parsedData , paths [0 ], paths [1 :len (paths )]))
57
50
}
58
51
59
52
func writeProperty (c * cli.Context ) {
@@ -68,7 +61,7 @@ func writeProperty(c *cli.Context) {
68
61
69
62
write (parsedData , paths [0 ], paths [1 :len (paths )], getValue (c .Args ()[2 ]))
70
63
71
- printYaml (parsedData , c . Bool ( "trim" ) )
64
+ printYaml (parsedData )
72
65
}
73
66
74
67
func getValue (argument string ) interface {} {
@@ -88,16 +81,15 @@ func getValue(argument string) interface{} {
88
81
return argument [1 : len (argument )- 1 ]
89
82
}
90
83
91
- func printYaml (context interface {}, trim bool ) {
84
+ func printYaml (context interface {}) {
92
85
out , err := yaml .Marshal (context )
93
86
if err != nil {
94
87
log .Fatalf ("error printing yaml: %v" , err )
95
88
}
96
89
outStr := string (out )
97
- if trim {
98
- outStr = strings .Trim (outStr , "\n " )
99
- }
100
- fmt .Println (outStr )
90
+ // trim the trailing new line as it's easier for a script to add
91
+ // it in if required than to remove it
92
+ fmt .Println (strings .Trim (outStr , "\n " ))
101
93
}
102
94
103
95
func readYaml (c * cli.Context , parsedData * map [interface {}]interface {}) {
0 commit comments