From 5f19315a668359dd8088304f9e48e42ede2ef0d4 Mon Sep 17 00:00:00 2001 From: Jan De Dobbeleer Date: Fri, 6 May 2022 20:19:30 +0200 Subject: [PATCH] fix(r): parse 4.2.0 correctly resolves #2229 --- src/segments/r.go | 2 +- src/segments/r_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/segments/r.go b/src/segments/r.go index 8d095bb1..547adaf0 100644 --- a/src/segments/r.go +++ b/src/segments/r.go @@ -14,7 +14,7 @@ func (r *R) Template() string { } func (r *R) Init(props properties.Properties, env environment.Environment) { - rRegex := `R (scripting front-end )?version (?P((?P[0-9]+).(?P[0-9]+).(?P[0-9]+)))` + rRegex := `version (?P((?P[0-9]+).(?P[0-9]+).(?P[0-9]+)))` r.language = language{ env: env, props: props, diff --git a/src/segments/r_test.go b/src/segments/r_test.go index 994addec..a1403c80 100644 --- a/src/segments/r_test.go +++ b/src/segments/r_test.go @@ -19,6 +19,7 @@ func TestR(t *testing.T) { HasRexe bool Version string }{ + {Case: "Rscript 4.2.0", ExpectedString: "4.2.0", HasRscript: true, Version: "Rscript (R) version 4.2.0 (2022-04-22)"}, {Case: "Rscript 4.1.3", ExpectedString: "4.1.3", HasRscript: true, Version: "R scripting front-end version 4.1.3 (2022-03-10)"}, {Case: "Rscript 4.1.3 patched", ExpectedString: "4.1.3", HasRscript: true, Version: "R scripting front-end version 4.1.3 Patched (2022-03-10 r81896)"}, {Case: "Rscript 4.0.0", ExpectedString: "4.0.0", HasRscript: true, Version: "R scripting front-end version 4.0.0 (2020-04-24)"},