Skip to content

Commit

Permalink
Export dbus address for the notification server
Browse files Browse the repository at this point in the history
Only screenshare script requires as of today, but put it in webcam also
for future proof as it doesn't cause any harm.

Assigning variable and declaration made separate due to ShellCheck
warning SC2155.

For: QubesOS/qubes-issues#6426
Fixes: QubesOS/qubes-issues#8457
Fixes: https://github.com/QubesOS/qubes-video-companion/issues/15
  • Loading branch information
ben-grande committed May 31, 2024
1 parent 6246500 commit 8898048
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
6 changes: 4 additions & 2 deletions qubes-rpc/services/qvc.ScreenShare
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/sh --

# Copyright (C) 2021 Elliot Killick <[email protected]>
# Copyright (C) 2021 Demi Marie Obenour <[email protected]>
# Licensed under the MIT License. See LICENSE file for details.
export DISPLAY=:0
set -eu
XDG_RUNTIME_DIR="/run/user/$(id -u)"
DBUS_SESSION_BUS_ADDRESS="unix:path=${XDG_RUNTIME_DIR}/bus"
export DISPLAY=:0 XDG_RUNTIME_DIR DBUS_SESSION_BUS_ADDRESS
exec python3 -- /usr/share/qubes-video-companion/sender/screenshare.py
8 changes: 5 additions & 3 deletions qubes-rpc/services/qvc.Webcam
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/sh --

# Copyright (C) 2021 Elliot Killick <[email protected]>
# Copyright (C) 2021 Demi Marie Obenour <[email protected]>
# Licensed under the MIT License. See LICENSE file for details.
export DISPLAY=:0
exec python3 -- /usr/share/qubes-video-companion/sender/webcam.py ${1:+"$1"}
set -eu
XDG_RUNTIME_DIR="/run/user/$(id -u)"
DBUS_SESSION_BUS_ADDRESS="unix:path=${XDG_RUNTIME_DIR}/bus"
export DISPLAY=:0 XDG_RUNTIME_DIR DBUS_SESSION_BUS_ADDRESS
exec python3 -- /usr/share/qubes-video-companion/sender/webcam.py "${1:+"$1"}"

0 comments on commit 8898048

Please sign in to comment.