c22dcdfe06
environment variables The goal is to update the environment variables for the user's systemd session **and** the services listening on user's d-bus session. Until now, the variables were updated using the `import-environment` environment command of `systemctl`. But, it would only be executed if systemd was present on the host system. Leaving the variables on the d-bus side either uninitialized or with incorrect values. Therefore, instead of using `systemctl`, use the `dbus-update-activation-environment` command to initialize/update the environment variables for user's d-bus session but also for user's systemd session. This is done by passing the `--systemd` option. When systemd is not detected, the command doesn't fail, it simply doesn't update the variables for user's systemd session. And since a systemd user session doesn't exist, no harm no foul.
50 lines
1.9 KiB
Bash
Executable file
50 lines
1.9 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
set -e
|
|
|
|
# From: https://people.debian.org/~mpitt/systemd.conf-2016-graphical-session.pdf
|
|
|
|
if command -v systemctl >/dev/null; then
|
|
# robustness: if the previous graphical session left some failed units,
|
|
# reset them so that they don't break this startup
|
|
for unit in $(systemctl --user --no-legend --state=failed --plain list-units | cut -f1 -d' '); do
|
|
partof="$(systemctl --user show -p PartOf --value "$unit")"
|
|
for target in cosmic-session.target graphical-session.target; do
|
|
if [ "$partof" = "$target" ]; then
|
|
systemctl --user reset-failed "$unit"
|
|
break
|
|
fi
|
|
done
|
|
done
|
|
fi
|
|
|
|
# use the user's preferred shell to acquire environment variables
|
|
# see: https://github.com/pop-os/cosmic-session/issues/23
|
|
if [ -n "${SHELL}" ]; then
|
|
# --in-login-shell: our flag to indicate that we don't need to recurse any further
|
|
if [ "${1}" != "--in-login-shell" ]; then
|
|
# `exec -l`: like `login`, prefixes $SHELL with a hyphen to start a login shell
|
|
exec bash -c "exec -l '${SHELL}' -c '${0} --in-login-shell'"
|
|
fi
|
|
fi
|
|
|
|
export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:=COSMIC}"
|
|
export XDG_SESSION_TYPE="${XDG_SESSION_TYPE:=wayland}"
|
|
export _JAVA_AWT_WM_NONREPARENTING=1
|
|
export GDK_BACKEND=wayland,x11
|
|
export MOZ_ENABLE_WAYLAND=1
|
|
export QT_QPA_PLATFORM="wayland;xcb"
|
|
export QT_AUTO_SCREEN_SCALE_FACTOR=1
|
|
export QT_ENABLE_HIGHDPI_SCALING=1
|
|
export DCONF_PROFILE=cosmic
|
|
|
|
if command -v dbus-update-activation-environment >/dev/null; then
|
|
# set environment variables for new units started by user service manager
|
|
dbus-update-activation-environment --systemd XDG_SESSION_TYPE XDG_CURRENT_DESKTOP DCONF_PROFILE
|
|
fi
|
|
# Run cosmic-session
|
|
if [[ -z "${DBUS_SESSION_BUS_ADDRESS}" ]]; then
|
|
exec /usr/bin/dbus-run-session -- /usr/bin/cosmic-session
|
|
else
|
|
exec /usr/bin/cosmic-session
|
|
fi
|