mirror of
https://github.com/wader/fq.git
synced 2024-11-21 23:04:07 +03:00
cli: Add go version to version string
This commit is contained in:
parent
5766566663
commit
550bcc27ff
@ -118,8 +118,9 @@ func (cr *CaseRun) getEnvInt(name string) int {
|
||||
|
||||
func (cr *CaseRun) Platform() interp.Platform {
|
||||
return interp.Platform{
|
||||
OS: "testos",
|
||||
Arch: "testarch",
|
||||
OS: "testos",
|
||||
Arch: "testarch",
|
||||
GoVersion: "testgo_version",
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -81,8 +81,9 @@ func newStandardOS() *stdOS {
|
||||
|
||||
func (stdOS) Platform() interp.Platform {
|
||||
return interp.Platform{
|
||||
OS: runtime.GOOS,
|
||||
Arch: runtime.GOARCH,
|
||||
OS: runtime.GOOS,
|
||||
Arch: runtime.GOARCH,
|
||||
GoVersion: runtime.Version(),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -168,7 +168,7 @@ def _main:
|
||||
)
|
||||
)
|
||||
);
|
||||
( . as {$version, $os, $arch, $args, args: [$arg0]}
|
||||
( . as {$version, $os, $arch, $go_version, $args, args: [$arg0]}
|
||||
# make sure we don't unintentionally use . to make things clearer
|
||||
| null
|
||||
| ( try _args_parse($args[1:]; _opt_cli_opts)
|
||||
@ -203,7 +203,7 @@ def _main:
|
||||
| println
|
||||
)
|
||||
elif $opts.show_version then
|
||||
"\($version) (\($os) \($arch))" | println
|
||||
"\($version) (\($os) \($arch) \($go_version))" | println
|
||||
elif
|
||||
( $opts.filenames == [null] and
|
||||
$opts.null_input == false and
|
||||
|
@ -131,8 +131,9 @@ type Output interface {
|
||||
}
|
||||
|
||||
type Platform struct {
|
||||
OS string
|
||||
Arch string
|
||||
OS string
|
||||
Arch string
|
||||
GoVersion string
|
||||
}
|
||||
|
||||
type CompleteFn func(line string, pos int) (newLine []string, shared int)
|
||||
@ -380,10 +381,11 @@ func (i *Interp) Main(ctx context.Context, output Output, versionStr string) err
|
||||
|
||||
platform := i.OS.Platform()
|
||||
input := map[string]any{
|
||||
"args": args,
|
||||
"version": versionStr,
|
||||
"os": platform.OS,
|
||||
"arch": platform.Arch,
|
||||
"args": args,
|
||||
"version": versionStr,
|
||||
"os": platform.OS,
|
||||
"arch": platform.Arch,
|
||||
"go_version": platform.GoVersion,
|
||||
}
|
||||
|
||||
iter, err := i.EvalFunc(ctx, input, "_main", nil, EvalOpts{output: output})
|
||||
|
2
pkg/interp/testdata/version.fqtest
vendored
2
pkg/interp/testdata/version.fqtest
vendored
@ -1,2 +1,2 @@
|
||||
$ fq -v
|
||||
testversion (testos testarch)
|
||||
testversion (testos testarch testgo_version)
|
||||
|
Loading…
Reference in New Issue
Block a user