Auto-detect Wayland in run.sh #1653
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Tested on a debian machine with Wayland, client launches successfully |
legoktm
reviewed
Mar 31, 2023
run.sh
Outdated
| @@ -46,6 +46,7 @@ gpg --allow-secret-key-import --import tests/files/securedrop.gpg.asc & | |||
|
|
|||
| # check whether current env is qubes | |||
| is_qubes="$(printenv | grep ^QUBES_)" || true | |||
| is_wayland="$(echo $XDG_SESSION_TYPE | grep ^wayland)" || true | |||
There was a problem hiding this comment.
Is there a reason we're grepping for it instead of a simple equality check?
There was a problem hiding this comment.
No 🙃 (well, yes, I wasn't 100% sure if suffixes like wayland-0 were valid or not, but looks like not). Fixing!
Sorry this has been sitting for 500 years
Closed
rocodes
force-pushed
the
is-it-wayland
branch
2 times, most recently
from
35c8ac2
to
7869a37
Compare
legoktm
approved these changes
Jun 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Optionally can replace #1652. Check XDG_SESSION_TYPE and if wayland, set QT_QPA_PLATFORM var when running the client.
Annoyingly, the warning ("Warning: Ignoring XDG_SESSION_TYPE=wayland on Gnome. Use QT_QPA_PLATFORM=wayland to run on Wayland anyway") is displayed even when the QT_QPA_PLATFORM environment variable is set.
Test Plan
Activate venv,
run.sh:Checklist
If these changes modify code paths involving cryptography, the opening of files in VMs or network (via the RPC service) traffic, Qubes testing in the staging environment is required. For fine tuning of the graphical user interface, testing in any environment in Qubes is required. Please check as applicable:
If these changes add or remove files other than client code, the AppArmor profile may need to be updated. Please check as applicable:
If these changes modify the database schema, you should include a database migration. Please check as applicable:
mainand confirmed that the migration is self-contained and applies cleanlymainand would like the reviewer to do so