btc-wire: simplify rpc code and improve documentation

1 files changed, 6 insertions, 13 deletions

diff --git a/script/prepare.sh b/script/prepare.sh
index 232210a..6aa4a54 100644
--- a/script/prepare.sh
+++ b/script/prepare.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## Install required dependencies to run tests
+## Install required dependencies to run tests without sudo
 
 set -eu
 
@@ -16,13 +16,9 @@ function cleanup() {
 
 trap cleanup EXIT
 
-echo "Ⅰ - Install latest postgres from source"
-cd $DIR
-git clone --depth 1 https://git.postgresql.org/git/postgresql.git
-cd postgresql
-./configure --prefix ~/postgresql
-make
-make install
+echo "Ⅰ - Find installed postgres version"
+PG_VER=`pg_config --version | egrep -o '[0-9]{1,}' | head -1`
+echo "Found version $PG_VER"
 
 echo "Ⅱ - Install bitcoind version 0.22"
 cd $DIR
@@ -32,7 +28,6 @@ mkdir -pv ~/bitcoin
 tar xvzf btc.tar.gz
 mv -v bitcoin-22.0/* ~/bitcoin
 
-
 echo "Ⅲ - Install Go Ethereum (Geth) v1.10.15 "
 cd $DIR
 curl -L https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-amd64-1.10.15-8be800ff.tar.gz -o geth.tar.gz
@@ -41,8 +36,6 @@ mkdir -pv ~/geth
 tar xvzf geth.tar.gz
 mv -v geth-alltools-linux-amd64-1.10.15-8be800ff/* ~/geth
 
-echo "Ⅳ - Config"
+echo "Ⅳ - PATH"
 
-echo "Add ~/postgresql/bin to your path"
-echo "Add ~/bitcoin/bin to your path"
-echo "Add ~/geth to your path"
\ No newline at end of file
+echo "Add PATH=\"$HOME/geth:$HOME/bitcoin/bin:/usr/lib/postgresql/$PG_VER/bin:$PATH:$PATH\" to your bash profile"
\ No newline at end of file