🎨 操作系统平台版本信息

kernel/model/conf.go

@@ -248,7 +248,7 @@ func InitConf() {
 		logging.LogInfof("using Microsoft Store edition")
 	}
 	Conf.System.OS = runtime.GOOS
-	Conf.System.OSPlatform, _ = util.GetOSPlatform()
+	Conf.System.OSPlatform = util.GetOSPlatform()
 
 	if "" != Conf.UserData {
 		Conf.User = loadUserFromConf()

kernel/util/os.go

@@ -23,11 +23,11 @@ import (
 	"github.com/siyuan-note/logging"
 )
 
-func GetOSPlatform() (plat, ver string) {
-	plat, _, ver, err := host.PlatformInformation()
+func GetOSPlatform() (plat string) {
+	plat, _, _, err := host.PlatformInformation()
 	if nil != err {
 		logging.LogWarnf("get os platform failed: %s", err)
-		return "Unknown", ""
+		return "Unknown"
 	}
 	return
 }

kernel/util/os_mobile.go

@@ -18,7 +18,7 @@
 
 package util
 
-func GetOSPlatform() (plat, ver string) {
+func GetOSPlatform() (plat string) {
 	if ContainerIOS == Container {
 		return "iOS " + MobileOSVer
 	}

kernel/util/runtime.go

@@ -46,11 +46,7 @@ var IsExiting = false
 var MobileOSVer string
 
 func logBootInfo() {
-	plat, platVer := GetOSPlatform()
-	osInfo := plat
-	if "" != platVer {
-		osInfo += " " + platVer
-	}
+	plat := GetOSPlatform()
 	logging.LogInfof("kernel is booting:\n"+
 		"    * ver [%s]\n"+
 		"    * arch [%s]\n"+
@@ -62,7 +58,7 @@ func logBootInfo() {
 		"    * container [%s]\n"+
 		"    * database [ver=%s]\n"+
 		"    * workspace directory [%s]",
-		Ver, runtime.GOARCH, osInfo, os.Getpid(), Mode, WorkingDir, ReadOnly, Container, DatabaseVer, WorkspaceDir)
+		Ver, runtime.GOARCH, plat, os.Getpid(), Mode, WorkingDir, ReadOnly, Container, DatabaseVer, WorkspaceDir)
 }
 
 func IsMutexLocked(m *sync.Mutex) bool {