Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wrong desktop environment detected when starting x11 with startx #138

Merged
merged 2 commits into from
May 22, 2024

Conversation

sHedC
Copy link
Collaborator

@sHedC sHedC commented May 22, 2024

Fixes #137

@sHedC
Copy link
Collaborator Author

sHedC commented May 22, 2024

One sec just noticed something else and infact now XWayland and XOrg are very close so merging.

@sHedC sHedC requested a review from netbrain May 22, 2024 09:51
@sHedC
Copy link
Collaborator Author

sHedC commented May 22, 2024

Comment here, on the WM check I now that XDG is probably now overkill but as it fixes some issues with other distros and window managers that the second check shoudl also handle.

Shall I risk removing it and sticking to jsut this? Just don't want to risk any breaking for users it currentlly works for.

if [ ! -z $WAYLAND_DISPLAY ]; then
    WINDOW_MANAGER="Wayland"
elif [ ! -z $DISPLAY ]; then
    WINDOW_MANAGER="XOrg"
fi

Copy link
Owner

@netbrain netbrain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@sHedC sHedC merged commit d2decba into master May 22, 2024
@sHedC sHedC deleted the sHedC/issue137 branch May 22, 2024 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

wrong desktop environment detected when starting x11 with startx
2 participants