Merge pull request #2486 from humblepenguinn/master

This commit is contained in:
Jesse Duffield 2023-03-06 17:34:08 +11:00 committed by GitHub
commit 4d78d76a44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,6 +2,7 @@ package config
import (
"io/ioutil"
"os"
"strings"
)
@ -10,9 +11,23 @@ func isWSL() bool {
return err == nil && strings.Contains(string(data), "microsoft")
}
func isContainer() bool {
data, err := ioutil.ReadFile("/proc/1/cgroup")
if strings.Contains(string(data), "docker") ||
strings.Contains(string(data), "/lxc/") ||
[]string{string(data)}[0] != "systemd" &&
[]string{string(data)}[0] != "init" ||
os.Getenv("container") != "" {
return err == nil && true
}
return err == nil && false
}
// GetPlatformDefaultConfig gets the defaults for the platform
func GetPlatformDefaultConfig() OSConfig {
if isWSL() {
if isWSL() && !isContainer() {
return OSConfig{
EditCommand: ``,
EditCommandTemplate: "",