mirror of
https://github.com/ProtonMail/proton-bridge.git
synced 2025-12-15 14:56:42 +00:00
GODT-1089 Explicitly open system preferences window on BigSur.
This commit is contained in:
@ -25,8 +25,20 @@ import (
|
||||
"github.com/Masterminds/semver/v3"
|
||||
)
|
||||
|
||||
// IsCatalinaOrNewer checks whether host is MacOS Catalina 10.15.x or higher.
|
||||
// IsCatalinaOrNewer checks whether the host is MacOS Catalina 10.15.x or higher.
|
||||
func IsCatalinaOrNewer() bool {
|
||||
return isThisDarwinNewerOrEqual(getMinCatalina())
|
||||
}
|
||||
|
||||
// IsBigSurOrNewer checks whether the host is MacOS BigSur 10.16.x or higher.
|
||||
func IsBigSurOrNewer() bool {
|
||||
return isThisDarwinNewerOrEqual(getMinBigSur())
|
||||
}
|
||||
|
||||
func getMinCatalina() *semver.Version { return semver.MustParse("10.15.0") }
|
||||
func getMinBigSur() *semver.Version { return semver.MustParse("10.16.0") }
|
||||
|
||||
func isThisDarwinNewerOrEqual(minVersion *semver.Version) bool {
|
||||
if runtime.GOOS != "darwin" {
|
||||
return false
|
||||
}
|
||||
@ -36,16 +48,14 @@ func IsCatalinaOrNewer() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
return isVersionCatalinaOrNewer(strings.TrimSpace(string(rawVersion)))
|
||||
return isVersionEqualOrNewer(minVersion, strings.TrimSpace(string(rawVersion)))
|
||||
}
|
||||
|
||||
func isVersionCatalinaOrNewer(rawVersion string) bool {
|
||||
// isVersionEqualOrNewer is separated to be able to run test on other than darwin.
|
||||
func isVersionEqualOrNewer(minVersion *semver.Version, rawVersion string) bool {
|
||||
semVersion, err := semver.NewVersion(rawVersion)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
minVersion := semver.MustParse("10.15.0")
|
||||
|
||||
return semVersion.GreaterThan(minVersion) || semVersion.Equal(minVersion)
|
||||
}
|
||||
|
||||
@ -38,7 +38,27 @@ func TestIsVersionCatalinaOrNewer(t *testing.T) {
|
||||
}
|
||||
|
||||
for args, exp := range testData {
|
||||
got := isVersionCatalinaOrNewer(args.version)
|
||||
got := isVersionEqualOrNewer(getMinCatalina(), args.version)
|
||||
assert.Equal(t, exp, got, "version %v", args.version)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsVersionBigSurOrNewer(t *testing.T) {
|
||||
testData := map[struct{ version string }]bool{
|
||||
{""}: false,
|
||||
{"9.0.0"}: false,
|
||||
{"9.15.0"}: false,
|
||||
{"10.13.0"}: false,
|
||||
{"10.14.0"}: false,
|
||||
{"10.14.99"}: false,
|
||||
{"10.15.0"}: false,
|
||||
{"10.16.0"}: true,
|
||||
{"11.0.0"}: true,
|
||||
{"11.1"}: true,
|
||||
}
|
||||
|
||||
for args, exp := range testData {
|
||||
got := isVersionEqualOrNewer(getMinBigSur(), args.version)
|
||||
assert.Equal(t, exp, got, "version %v", args.version)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user