taigrr/yq
1
0
Fork 0
mirror of https://github.com/taigrr/yq synced 2025-01-18 04:53:17 -08:00
Code Issues Projects Releases Wiki Activity

added exit status

Browse Source
This commit is contained in:
Mike Farah
2020-11-30 16:35:21 +11:00
parent 9bc66c80b6
commit c9229439f7
5 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/constant.go
View File

@@ -5,7 +5,7 @@ var unwrapScalar = true
var writeInplace = false
var outputToJSON = false
// var exitStatus = false
var exitStatus = false
var forceColor = false
var forceNoColor = false
var colorsEnabled = false

7
cmd/evaluate_all_command.go
View File

@@ -1,6 +1,7 @@
package cmd
import (
"errors"
"fmt"
"os"
@@ -24,6 +25,7 @@ yq es -n '{"a": "b"}'
return cmdEvalAll
}
func evaluateAll(cmd *cobra.Command, args []string) error {
cmd.SilenceUsage = true
// 0 args, read std in
// 1 arg, null input, process expression
// 1 arg, read file in sequence
@@ -81,6 +83,9 @@ func evaluateAll(cmd *cobra.Command, args []string) error {
completedSuccessfully = err == nil
cmd.SilenceUsage = true
if err == nil && exitStatus && !printer.PrintedAnything() {
return errors.New("no matches found")
}
return err
}

8
cmd/evalute_sequence_command.go
View File

@@ -1,6 +1,7 @@
package cmd
import (
"errors"
"fmt"
"os"
@@ -24,6 +25,7 @@ yq es -n '{"a": "b"}'
return cmdEvalSequence
}
func evaluateSequence(cmd *cobra.Command, args []string) error {
cmd.SilenceUsage = true
// 0 args, read std in
// 1 arg, null input, process expression
// 1 arg, read file in sequence
@@ -81,6 +83,10 @@ func evaluateSequence(cmd *cobra.Command, args []string) error {
err = streamEvaluator.EvaluateFiles(args[0], args[1:], printer)
}
completedSuccessfully = err == nil
cmd.SilenceUsage = true
if err == nil && exitStatus && !printer.PrintedAnything() {
return errors.New("no matches found")
}
return err
}

1
cmd/root.go
View File

@@ -47,6 +47,7 @@ func New() *cobra.Command {
rootCmd.PersistentFlags().IntVarP(&indent, "indent", "I", 2, "sets indent level for output")
rootCmd.Flags().BoolVarP(&version, "version", "V", false, "Print version information and quit")
rootCmd.PersistentFlags().BoolVarP(&writeInplace, "inplace", "i", false, "update the yaml file inplace of first yaml file given.")
rootCmd.PersistentFlags().BoolVarP(&exitStatus, "exit-status", "e", false, "set exit status if there are no matches or null or false is returned")
rootCmd.PersistentFlags().BoolVarP(&forceColor, "colors", "C", false, "force print with colors")
rootCmd.PersistentFlags().BoolVarP(&forceNoColor, "no-colors", "M", false, "force print with no colors")