Skip to content

fix: replace XWayland backend with Wayland in Wayland sessions #414

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: replace XWayland backend with Wayland in Wayland sessions #414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions src/timeshift-launcher
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,32 @@

app_command='timeshift-gtk'

if [ "$(id -u)" -eq 0 ]; then
if [[ "$(id -u)" -eq 0 ]]; then
# user is admin
${app_command}
exec "${app_command}" "$@"
else
# user is not admin
if echo $- | grep "i" >/dev/null 2>&1; then
# script is running in interactive mode
su - -c "${app_command}"
exec su - -c "${app_command}" "$@"
else
# script is running in non-interactive mode
if [ "$XDG_SESSION_TYPE" = "wayland" ] ; then
xhost +SI:localuser:root
pkexec ${app_command}
xhost -SI:localuser:root
xhost
elif command -v pkexec >/dev/null 2>&1; then
pkexec ${app_command}
if command -v pkexec >/dev/null 2>&1; then
env_array=("GTK_THEME=${GTK_THEME}")

if [[ "${XDG_SESSION_TYPE}" == "wayland" ]]; then
env_array+=("WAYLAND_DISPLAY=${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY}" "XDG_RUNTIME_DIR=/run/user/0")
else
env_array+=("DISPLAY=${DISPLAY}" "XAUTHORITY=${XAUTHORITY}")
fi

exec pkexec env "${env_array[@]}" "${app_command}" "$@"
elif command -v sudo >/dev/null 2>&1; then
x-terminal-emulator -e "sudo ${app_command}"
exec sudo -E "${app_command}" "$@"
elif command -v su >/dev/null 2>&1; then
x-terminal-emulator -e "su - -c '${app_command}'"
exec su - -c "${app_command}" "$@"
else
x-terminal-emulator -e "echo 'Command must be run as root user: ${app_command}'"
echo "Command must be run as root user: ${app_command}"
fi
fi
fi