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.

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

Fix find pid on OSX #5155

Merged
merged 1 commit into from
Feb 10, 2021
Merged

Conversation

ghubstan
Copy link
Contributor

@ghubstan ghubstan commented Feb 4, 2021

The trade simulation scripts check that bitcoind, a seed node, an arbitration node, and Bob & Alice nodes are running at startup, but the bash pgrep command used to find the PIDs does not work on OSX (darwin20). An adjustment was made to the env script to find java PIDs with ps and awk, if running on OSX.

Two additonal startup checks were added: make sure the script is running on supported OS (Linux or OSX), and bitcoin-cli is in the PATH.

Also removed some usage error text about registering dispute agents; the scripts do that now.

The trade simulation scripts check that bitcoind, seed node,
arbitration node, and bob & alice nodes are running at startup,
but the bash pgrep command used to find the PIDs does not work on
OSX (my darwin20), so an adjustment was made to the env script to
find java PIDs with ps and awk if running on OSX.

Two additonal startup checks were added: make sure the script is
running on supported OS (Linux or OSX), and bitcoin-cli is in
the PATH.

Also removed usage error text about registering dispute agents.
The scripts do that now.
Copy link
Contributor

@ripcurlx ripcurlx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@ripcurlx ripcurlx merged commit 840b3dc into bisq-network:master Feb 10, 2021
@ghubstan ghubstan deleted the 01-fix-find-pid-on-osx branch February 10, 2021 19:52
@ripcurlx ripcurlx added this to the v1.6.0 milestone Feb 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants