Commit 717d8b02 authored by Guido Gunther's avatar Guido Gunther Committed by Guido Gunther

phosh.in: Use builtin session handling

Until we can rely on a newer gnome-session use the builtin session
handling everywhere for now instead of systemd.
Signed-off-by: Guido Gunther's avatarGuido Günther <guido.gunther@puri.sm>
Closes: #181
parent 75000765
Pipeline #50379 passed with stages
in 8 minutes and 55 seconds
......@@ -3,6 +3,19 @@
COMPOSITOR="/usr/bin/rootston"
ROOTSTON_INI="@pkgdatadir@/rootston.ini"
gnome_session_args()
{
ARGS="--disable-acceleration-check --session=phosh"
# Use builtin session handling until we can rely
# on a newer gnome-session everywhere
if gnome-session --help | grep -qs -e--builtin; then
ARGS="--builtin ${ARGS}"
fi
echo "${ARGS}"
}
if [ -x @bindir@/phoc ]; then
COMPOSITOR=@bindir@/phoc
elif [ -x /usr/bin/phoc ]; then
......@@ -15,4 +28,4 @@ fi
# Run gnome-session through a login shell so it picks
# variables from /etc/profile.d (XDG_*)
exec "${COMPOSITOR}" -C "${ROOTSTON_INI}" -E "bash -lc 'gnome-session --disable-acceleration-check --session=phosh'"
exec "${COMPOSITOR}" -C "${ROOTSTON_INI}" -E "bash -lc 'gnome-session $(gnome_session_args)'"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment