chore: add os name to platform files, remove find func in rules

mworzala · Sep 16, 2023 · 5a62b1c · 5a62b1c
1 parent d5d37d0
commit 5a62b1c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/internal/pkg/game/rule/rule.go b/internal/pkg/game/rule/rule.go
@@ -62,7 +62,7 @@ func NewEvaluator(features ...string) *Evaluator {
 	}
 
 	return &Evaluator{
-		os:       determineOS(),
+		os:       platform.Name,
 		arch:     determineArch(),
 		version:  determineVersion(),
 		features: featureMap,
@@ -114,19 +114,6 @@ func (e *Evaluator) evalSingle(rule *Rule) Action {
 	return action
 }
 
-func determineOS() string {
-	switch runtime.GOOS {
-	case "darwin":
-		return "osx"
-	case "linux":
-		return "linux"
-	case "windows":
-		return "windows"
-	default:
-		panic(fmt.Sprintf("unsupported os/arch: %s/%s", runtime.GOOS, runtime.GOARCH))
-	}
-}
-
 func determineArch() string {
 	switch runtime.GOARCH {
 	case "amd64":

diff --git a/internal/pkg/platform/platform_darwin.go b/internal/pkg/platform/platform_darwin.go
@@ -3,7 +3,10 @@
 
 package platform
 
-const ClasspathSeparator = ":"
+const (
+	Name               = "osx"
+	ClasspathSeparator = ":"
+)
 
 func GetVersion() (string, error) {
 	return "unknown", nil

diff --git a/internal/pkg/platform/platform_linux.go b/internal/pkg/platform/platform_linux.go
@@ -3,7 +3,10 @@
 
 package platform
 
-const ClasspathSeparator = ":"
+const (
+	Name               = "linux"
+	ClasspathSeparator = ":"
+)
 
 func GetVersion() (string, error) {
 	return "unknown", nil

diff --git a/internal/pkg/platform/platform_windows.go b/internal/pkg/platform/platform_windows.go
@@ -5,7 +5,10 @@ package platform
 
 import "golang.org/x/sys/windows/registry"
 
-const ClasspathSeparator = ";"
+const (
+	Name               = "windows"
+	ClasspathSeparator = ";"
+)
 
 func GetVersion() (string, error) {
 	const NTCurrentVersionKey = `SOFTWARE\Microsoft\Windows NT\CurrentVersion`