commit f4e5b87a27e825c537f259c7d244f474f146aea2 parent 245d087e721b0cb661d8ff483484e4ed0485cf44 Author: Antoine A <> Date: Thu, 17 Feb 2022 19:14:58 +0100 test: reuse postgres binaries from debian package Diffstat:
| M | script/prepare.sh | | | 10 | +++++----- |
| M | test/common.sh | | | 6 | +++--- |
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/script/prepare.sh b/script/prepare.sh @@ -28,14 +28,14 @@ mkdir -pv ~/bitcoin tar xvzf btc.tar.gz mv -v bitcoin-22.0/* ~/bitcoin -echo "Ⅲ - Install Go Ethereum (Geth) v1.10.15 " +echo "Ⅲ - Install Go Ethereum (Geth) v1.10.16" 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 +curl -L https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-amd64-1.10.16-20356e57.tar.gz -o geth.tar.gz rm -rfv ~/geth mkdir -pv ~/geth tar xvzf geth.tar.gz -mv -v geth-alltools-linux-amd64-1.10.15-8be800ff/* ~/geth +mv -v geth-alltools-linux-amd64-1.10.16-20356e57/* ~/geth echo "Ⅳ - PATH" -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 +echo "Add PATH=\"\$HOME/geth:\$HOME/bitcoin/bin:/usr/lib/postgresql/$PG_VER/bin:\$PATH\" to your bash profile" +\ No newline at end of file diff --git a/test/common.sh b/test/common.sh @@ -90,8 +90,8 @@ function stop_node() { function setup_db() { pg_ctl init -D $DB_DIR &>> log/postgres.log echo "port=5454" >> $DB_DIR/postgresql.conf - pg_ctl start -D $DB_DIR >> log/postgres.log - echo "CREATE ROLE postgres LOGIN SUPERUSER PASSWORD 'password'" | psql -p 5454 postgres > /dev/null + start_db + echo "CREATE ROLE postgres LOGIN SUPERUSER PASSWORD 'password'" | psql -h localhost -p 5454 postgres > /dev/null $WIRE_CLI initdb > /dev/null } @@ -108,7 +108,7 @@ function stop_db() { # Start database function start_db() { - pg_ctl start -D $DB_DIR >> log/postgres.log + pg_ctl start -D $DB_DIR -o "-c unix_socket_directories=$DIR" >> log/postgres.log } # ----- Bitcoin node ----- #