Skip to content

Commit

Permalink
dev: if no gpg-agent, don't bail
Browse files Browse the repository at this point in the history
since in the trusty dev env, there's no gpg-agent, let's make
sure we don't bail out this function (pkill returns 1 if the
process was not found)
  • Loading branch information
redshiftzero committed Feb 1, 2019
1 parent ef5a79b commit d30e19d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions securedrop/bin/dev-deps
Expand Up @@ -46,8 +46,8 @@ function reset_demo() {
# Create gpg-agent.conf
echo allow-loopback-pinentry > /var/lib/securedrop/keys/gpg-agent.conf

# Kill gpg-agent(s) so it picks up the new config on restart.
pkill -f gpg-agent
# Kill gpg-agent(s) if they exist so it picks up the new config on restart.
pkill -f gpg-agent || true
# Note that we should avoid `gpgconf --kill gpg-agent` since the pkill command will
# handle killing multiple gpg-agent processes if they exist (this is what we want).

Expand Down

0 comments on commit d30e19d

Please sign in to comment.