From cbca39529176c463c1c72c997ae70f2c3347235a Mon Sep 17 00:00:00 2001
From: "Jason T. Greene" <jason.greene@redhat.com>
Date: Tue, 3 Oct 2023 00:08:31 -0500
Subject: [PATCH] Fix locale issues with WSL version detection
Since wsl --version triggers help, which triggers an error code,
use that instead of text detection.
[NO NEW TESTS NEEDED]
Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
---
pkg/machine/wsl/wutil/wutil.go | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/pkg/machine/wsl/wutil/wutil.go b/pkg/machine/wsl/wutil/wutil.go
index ee72c665b4..b994d25026 100644
--- a/pkg/machine/wsl/wutil/wutil.go
+++ b/pkg/machine/wsl/wutil/wutil.go
@@ -50,20 +50,13 @@ func IsWSLInstalled() bool {
func IsWSLStoreVersionInstalled() bool {
cmd := SilentExecCmd("wsl", "--version")
- out, err := cmd.StdoutPipe()
+ cmd.Stdout = nil
cmd.Stderr = nil
- if err != nil {
- return false
- }
- if err = cmd.Start(); err != nil {
- return false
- }
- hasVersion := matchOutputLine(out, "WSL version:")
- if err := cmd.Wait(); err != nil {
+ if err := cmd.Run(); err != nil {
return false
}
- return hasVersion
+ return true
}
func matchOutputLine(output io.ReadCloser, match string) bool {