fix: detect wsl using env variable

JanDeDobbeleer · Feb 15, 2021 · e0e2962 · e0e2962
1 parent 73eab4a
commit e0e2962
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/engine.go b/src/engine.go
@@ -165,6 +165,8 @@ func (e *engine) render() {
 	}
 
 	cwd := e.env.getcwd()
+
+	// temp to fix 3.89 issue and add wsl support
 	if e.env.isWsl() {
 		// transform path
 		cwd, _ = e.env.runCommand("wslpath", "-m", cwd)

diff --git a/src/environment_unix.go b/src/environment_unix.go
@@ -5,7 +5,6 @@ package main
 import (
 	"errors"
 	"os"
-	"strings"
 )
 
 func (env *environment) isRunningAsRoot() bool {
@@ -21,6 +20,9 @@ func (env *environment) getWindowTitle(imageName, windowTitleRegex string) (stri
 }
 
 func (env *environment) isWsl() bool {
-	version := env.getFileContent("/proc/version")
-	return strings.Contains(version, "microsoft")
+	// one way to check
+	// version := env.getFileContent("/proc/version")
+	// return strings.Contains(version, "microsoft")
+	// using env variable
+	return env.getenv("WSL_DISTRO_NAME") != ""
 }