From 6bdf55923c0b837af294552b8d3531dbfc134667 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Sun, 5 Mar 2017 18:37:26 -0500 Subject: [PATCH] Do the whole pgtap build and install as root Signed-off-by: Dan Scott --- installer/jessie/eg_jessie_installer.sh | 6 +----- installer/wheezy/eg_wheezy_installer.sh | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/installer/jessie/eg_jessie_installer.sh b/installer/jessie/eg_jessie_installer.sh index 64b120c5e..d8c57e81a 100755 --- a/installer/jessie/eg_jessie_installer.sh +++ b/installer/jessie/eg_jessie_installer.sh @@ -443,16 +443,12 @@ function configure_database { if [ $LIVETEST ]; then PG_TAP_VER="0.97.0" - PG_CMD=" wget http://api.pgxn.org/dist/pgtap/$PG_TAP_VER/pgtap-$PG_TAP_VER.zip \ && unzip pgtap-$PG_TAP_VER.zip \ && cd pgtap-$PG_TAP_VER \ && make \ && make installcheck - " - su - postgres -c "$PG_CMD" - cd /var/lib/postgresql/pgtap \ - && make install; + && make install echo 'CREATE EXTENSION pgtap;' | su - postgres -c "psql evergreen" fi; echo configure database =~-._ diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh index 810db7260..a33a13253 100755 --- a/installer/wheezy/eg_wheezy_installer.sh +++ b/installer/wheezy/eg_wheezy_installer.sh @@ -451,16 +451,12 @@ function configure_database { if [ $LIVETEST ]; then PG_TAP_VER="0.97.0" - PG_CMD=" wget http://api.pgxn.org/dist/pgtap/$PG_TAP_VER/pgtap-$PG_TAP_VER.zip \ && unzip pgtap-$PG_TAP_VER.zip \ && cd pgtap-$PG_TAP_VER \ && make \ && make installcheck - " - su - postgres -c "$PG_CMD" - cd /var/lib/postgresql/pgtap \ - && make install; + && make install echo 'CREATE EXTENSION pgtap;' | su - postgres -c "psql evergreen" fi; echo configure database =~-._ -- 2.11.0