Skip to content
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

Change session cleanup mechanism #28

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Change session cleanup mechanism #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
562f2c6
change session cleanup mechanism
yegorius Dec 23, 2023
c896cc3
Minor improvement
yegorius Apr 16, 2024
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
46 changes: 17 additions & 29 deletions src/session.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ VARIABLES="DESKTOP_SESSION XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_T
VARIABLES="${VARIABLES} DISPLAY I3SOCK SWAYSOCK WAYLAND_DISPLAY"
SESSION_TARGET="sway-session.target"
SESSION_SHUTDOWN_TARGET="sway-session-shutdown.target"
WITH_CLEANUP=1
ENV_FILE="$XDG_RUNTIME_DIR/$SESSION_TARGET.env"

print_usage() {
cat <<EOH
Expand All @@ -52,10 +52,20 @@ Usage:
--add-env NAME, -E NAME
Add a variable name to the subset of environment passed
to the user session. Can be specified multiple times.
--no-cleanup Skip cleanup code at compositor exit.
--exit Stop sway session and exit sway.
EOH
}

session_cleanup () {
# stop the session target and unset the variables
systemctl --user start --job-mode=replace-irreversibly "$SESSION_SHUTDOWN_TARGET"
if [ -f "$ENV_FILE" ]; then
# shellcheck disable=SC2086
xargs -a "$ENV_FILE" systemctl --user unset-environment
rm "$ENV_FILE"
fi
}

while [ $# -gt 0 ]; do
case "$1" in
--help)
Expand All @@ -72,10 +82,10 @@ while [ $# -gt 0 ]; do
--add-env | -E)
shift
VARIABLES="${VARIABLES} ${1}" ;;
--with-cleanup)
;; # ignore (enabled by default)
--no-cleanup)
unset WITH_CLEANUP ;;
--exit)
session_cleanup
swaymsg exit
exit ;;
-*)
echo "Unexpected option: $1" 1>&2
print_usage
Expand Down Expand Up @@ -111,26 +121,4 @@ systemctl --user reset-failed
# shellcheck disable=SC2086
systemctl --user import-environment $VARIABLES
systemctl --user start "$SESSION_TARGET"

# Optionally, wait until the compositor exits and cleanup variables and services.
if [ -z "$WITH_CLEANUP" ] ||
[ -z "$SWAYSOCK" ] ||
! hash swaymsg 2>/dev/null
then
exit 0;
fi

# declare cleanup handler and run it on script termination via kill or Ctrl-C
session_cleanup () {
# stop the session target and unset the variables
systemctl --user start --job-mode=replace-irreversibly "$SESSION_SHUTDOWN_TARGET"
if [ -n "$VARIABLES" ]; then
# shellcheck disable=SC2086
systemctl --user unset-environment $VARIABLES
fi
}
trap session_cleanup INT TERM
# wait until the compositor exits
swaymsg -t subscribe '["shutdown"]'
# run cleanup handler on normal exit
session_cleanup
echo "$VARIABLES" > "$ENV_FILE"