mirror of
https://github.com/niri-wm/niri.git
synced 2026-06-22 02:01:55 +07:00
Mark Karlinsky
3bfa4a71ff
* Improve dinit service files and niri-session Two main changes were made: - After a discussion in davmac314/dinit#496, 2 dinit services are now provided. The first one is 'niri', which runs niri itself, and the second one is 'niri.target' which brings up all the dependences from user configuration. - Made the behaviour of 'niri-session' when running under dinit closer to the behaviour when running under systemd. In particular, now the script wait for service completion, because some login managers shut the session down the moment the startup script completes. * Update paths in docs
96 lines
3.4 KiB
Bash
Executable File
96 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# Detect if being run as a user service, which implies external session management,
|
|
# exec compositor directly
|
|
if [ -n "${MANAGERPID:-}" ] && [ "${SYSTEMD_EXEC_PID:-}" = "$$" ]; then
|
|
case "$(ps -p "$MANAGERPID" -o cmd=)" in
|
|
*systemd*--user*)
|
|
exec niri --session
|
|
;;
|
|
esac
|
|
fi
|
|
|
|
if [ -n "$SHELL" ] &&
|
|
grep -q "$SHELL" /etc/shells &&
|
|
! (echo "$SHELL" | grep -q "false") &&
|
|
! (echo "$SHELL" | grep -q "nologin"); then
|
|
if [ "$1" != '-l' ]; then
|
|
exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
|
|
else
|
|
shift
|
|
fi
|
|
fi
|
|
|
|
# Try to detect the service manager that is being used
|
|
if hash systemctl >/dev/null 2>&1; then
|
|
# Make sure there's no already running session.
|
|
if systemctl --user -q is-active niri.service; then
|
|
echo 'A niri session is already running.'
|
|
exit 1
|
|
fi
|
|
|
|
# Reset failed state of all user units.
|
|
systemctl --user reset-failed
|
|
|
|
# Import the login manager environment.
|
|
systemctl --user import-environment
|
|
|
|
# DBus activation environment is independent from systemd. While most of
|
|
# dbus-activated services are already using `SystemdService` directive, some
|
|
# still don't and thus we should set the dbus environment with a separate
|
|
# command.
|
|
if hash dbus-update-activation-environment 2>/dev/null; then
|
|
dbus-update-activation-environment --all
|
|
fi
|
|
|
|
# Start niri and wait for it to terminate.
|
|
systemctl --user --wait start niri.service
|
|
|
|
# Force stop of graphical-session.target.
|
|
systemctl --user start --job-mode=replace-irreversibly niri-shutdown.target
|
|
|
|
# Unset environment that we've set.
|
|
systemctl --user unset-environment WAYLAND_DISPLAY DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP NIRI_SOCKET
|
|
elif hash dinitctl >/dev/null 2>&1; then
|
|
# Check that the user dinit daemon is running
|
|
if ! pgrep -u "$(id -u)" dinit >/dev/null 2>&1; then
|
|
echo "dinit user daemon is not running."
|
|
exit 1
|
|
fi
|
|
|
|
# Make sure there's no already running session.
|
|
if dinitctl --quiet --user is-started niri 2>/dev/null; then
|
|
echo 'A niri session is already running.'
|
|
exit 1
|
|
fi
|
|
|
|
# Import the login manager environment into dinit
|
|
# Might not work correctly for multiline variable names, but
|
|
# it is reasonable to assume there are none
|
|
awk 'BEGIN{for(v in ENVIRON) if (v != "AWKPATH" && v != "AWKLIBPATH") print v}' 2>/dev/null | xargs dinitctl --quiet --user setenv 2>/dev/null
|
|
|
|
# Usually the dbus service would start as niri's dependency and inherit
|
|
# environment from dinit, but in case it has already started we need
|
|
# to update its environment.
|
|
if hash dbus-update-activation-environment >/dev/null 2>&1; then
|
|
dbus-update-activation-environment --all >/dev/null 2>&1
|
|
fi
|
|
|
|
# Create the directory for the logfile, if doesn't exist
|
|
mkdir --parents $HOME/.local/share/niri
|
|
# Start niri
|
|
dinitctl --quiet --user start niri.target 2>&1
|
|
|
|
# Wait for termination
|
|
dinit-monitor --user --initial -c $'sh -c "
|
|
if [ "%s" = "stopped" ] || [ "%s" = "failed" ]; then
|
|
ppid=$(ps -o ppid= -p $$)
|
|
kill $ppid
|
|
fi"' niri >/dev/null 2>&1
|
|
|
|
# Unset environment that we've set.
|
|
dinitctl --quiet --user unsetenv WAYLAND_DISPLAY DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP NIRI_SOCKET 2>/dev/null
|
|
else
|
|
echo "No systemd or dinit detected, please use niri --session instead."
|
|
fi
|