chore: move classpath separator to platform dependent constant

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

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/internal/pkg/game/launch/launch.go b/internal/pkg/game/launch/launch.go
@@ -63,7 +63,7 @@ func LaunchProfile(dataDir string, p *profile.Profile, acc *account.Account, acc
 			artifactPath := fmt.Sprintf("%s/%s/%s/%s-%s.jar", strings.ReplaceAll(groupId, ".", "/"), artifactName, version, artifactName, version)
 			classpath.WriteString(path.Join(librariesPath, artifactPath))
 		}
-		classpath.WriteString(platform.ClasspathSeparator())
+		classpath.WriteString(platform.ClasspathSeparator)
 	}
 
 	if spec.InheritsFrom != "" {

diff --git a/internal/pkg/platform/platform.go b/internal/pkg/platform/platform.go
@@ -60,10 +60,3 @@ func OpenUrl(url string) error {
 func WriteToClipboard(text string) error {
 	return clipboard.WriteAll(text)
 }
-
-func ClasspathSeparator() string {
-	if runtime.GOOS == "windows" {
-		return ";"
-	}
-	return ":"
-}
diff --git a/internal/pkg/platform/platform_darwin.go b/internal/pkg/platform/platform_darwin.go
@@ -3,6 +3,8 @@
 
 package platform
 
+const 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,6 +3,8 @@
 
 package platform
 
+const 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,11 +5,10 @@ package platform
 
 import "golang.org/x/sys/windows/registry"
 
-const (
-	NTCurrentVersionKey = `SOFTWARE\Microsoft\Windows NT\CurrentVersion`
-)
+const ClasspathSeparator = ";"
 
 func GetVersion() (string, error) {
+	const NTCurrentVersionKey = `SOFTWARE\Microsoft\Windows NT\CurrentVersion`
 	k, err := registry.OpenKey(registry.LOCAL_MACHINE, NTCurrentVersionKey, registry.QUERY_VALUE)
 	if err != nil {
 		return "", err