Skip to content

packaging: only kill main electron process in run_keybase #17463

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

Merged
heronhaye merged 1 commit into from
May 9, 2019
Merged

packaging: only kill main electron process in run_keybase #17463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions packaging/linux/run_keybase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ systemd_stop_if_active() {
# This works no matter how the services were started, because our
# Restart=on-failure systemd unit configuration won't restart after SIGTERM.
kill_all() {
# systemd will restart services if they failed to stop, so do this explicitly
# systemd will restart services if they failed to stop cleanly, so do this explicitly
# first to make the rest of a function a no-op.
if [ "$KEYBASE_KILL" = "1" ]; then
systemd_stop_if_active "keybase"
Expand All @@ -25,7 +25,13 @@ kill_all() {
systemd_stop_if_active "keybase-redirector"
fi

killall Keybase &> /dev/null && echo Shutting down Keybase GUI...
# Only stop main Electron process; others have additional flags after the process name
# Child Electron processes will be stopped by main process' handler
if main_electron_pids="$(pgrep 'Keybase$')"; then
# intentionally splitting pids
# shellcheck disable=SC2046
kill $(echo "$main_electron_pids" | xargs) &> /dev/null && echo Shutting down Keybase GUI...
fi

# mountdir may be empty on the initial install, so don't try to unmount in that case.
if mountdir="$(keybase config get --direct --bare mountdir 2> /dev/null)" && [ -n "$mountdir" ]; then
Expand Down