test: detect segwit correctly, assume master branch.

Segwit was merged, but the strings changed between there and segwit4
(also, my BIP9 patch changed the output).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-06-25 14:07:47 +09:30
parent 1dbe001fdc
commit 2436207a7a
3 changed files with 3 additions and 6 deletions

View File

@@ -29,10 +29,10 @@ while ! $CLI getinfo >/dev/null 2>&1; do
done
# Make sure they have segwit support!
if $CLI getblockchaininfo | grep -q '"witness"'; then :
if $CLI getblockchaininfo | grep -q '"segwit"'; then :
else
echo This bitcoind does not have segwit support. >&2
echo Please install one from https://github.com/sipa/bitcoin/tree/segwit4 >&2
echo Please install a recent one >&2
exit 1
fi