extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-11-21 23:53:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Accept any XDG_ environment variable to determine desktop (#2037)" (#2042)

Browse Source 
This reverts commit 67e2185964.
This commit is contained in:
Maycon Santos 2024-05-23 23:15:02 +02:00 committed by GitHub
parent 29a2d93873
commit 69048bfd34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/cmd/login.go
View File

@ -219,15 +219,5 @@ func openURL(cmd *cobra.Command, verificationURIComplete, userCode string) {
// isLinuxRunningDesktop checks if a Linux OS is running desktop environment
func isLinuxRunningDesktop() bool {
if os.Getenv("DESKTOP_SESSION") != "" {
return true
}
for _, env := range os.Environ() {
if strings.HasPrefix(env, "XDG_") {
return true
}
}
return false
return os.Getenv("DESKTOP_SESSION") != "" || os.Getenv("XDG_CURRENT_DESKTOP") != ""
}

14
client/cmd/login_test.go
View File

@ -2,7 +2,6 @@ package cmd
import (
"fmt"
"runtime"
"strings"
"testing"
@ -52,16 +51,3 @@ func TestLogin(t *testing.T) {
t.Errorf("expected non empty Private key, got empty")
}
}
func TestIsLinuxRunningDesktop(t *testing.T) {
if runtime.GOOS != "linux" {
t.Skip("skipping test on non-linux platform")
}
t.Setenv("XDG_FOO", "BAR")
isDesktop := isLinuxRunningDesktop()
if !isDesktop {
t.Errorf("expected desktop environment, got false")
}
}