salt/firestarter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move logout trap so that you can actually use the tool normally

Browse Source
This commit is contained in:
Salt 2019-06-21 08:18:22 -05:00
parent adae474436
commit 5be7923570
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
firestarter
View File

@ -55,23 +55,6 @@ startfile() {
fi fi
} }
# Traps
trap_exit() {
log "Logging out"
if command -v loginctl > /dev/null 2>&1; then
# Use loginctl if possible
local sessionid="$(< /proc/self/sessionid)"
if [ -n "$sessionid" ]; then
loginctl terminate-session "$sessionid"
fi
else
# Otherwise just brute it
kill $(jobs -p)
fi
return 0
}
trap trap_exit EXIT
# Steps in execution # Steps in execution
step_generate() { step_generate() {
log "Creating default config setup in \"$g_configdir\"" log "Creating default config setup in \"$g_configdir\""
@ -399,9 +382,24 @@ step_wait() {
[ "$dryrun" = "1" ] && exit 0 [ "$dryrun" = "1" ] && exit 0
log "Waiting for programs to exit" log "Waiting for programs to exit"
log "Send any termination signal to firestarter to log out" log "Send any termination signal to firestarter to log out"
trap step_logout EXIT
wait wait
exit 0 exit 0
} }
step_logout() {
log "Logging out"
if command -v loginctl > /dev/null 2>&1; then
# Use loginctl if possible
local sessionid="$(< /proc/self/sessionid)"
if [ -n "$sessionid" ]; then
loginctl terminate-session "$sessionid"
fi
else
# Otherwise just brute it
kill $(jobs -p)
fi
return 0
}
# Main # Main
main() { main() {