Do the whole pgtap build and install as root

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --git a/installer/jessie/eg_jessie_installer.sh b/installer/jessie/eg_jessie_installer.sh
index 64b120c..d8c57e8 100755 (executable)
--- 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 810db72..a33a132 100755 (executable)
--- 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 =~-._