pgpool2.git / summary / log / commit / refs

commit    7531ff43c00e6bc1c6db694ce7ea03792a2f4481
Author:   Tatsuo Ishii <ishii@sraoss.co.jp>
Date:     Tue Oct 09 01:47:24 2018 +0000

    Allow to handle beta or rc version.
    
    pgpool_setup failed to extract major version number if it includes non
    numeric characters.


 src/test/pgpool_setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index 7baf456e9..36cd27cce 100755
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -97,7 +97,7 @@ PG_CTL=$PGBIN/pg_ctl
 PSQL=$PGBIN/psql
 
 # get PostgreSQL major version
-PGVERSION=`$INITDB -V|awk '{print $3}'|sed 's/\..*//'`
+PGVERSION=`$INITDB -V|awk '{print $3}'|sed 's/\..*//'|sed 's/\([0-9]*\)[a-zA-Z].*/\1/'`
 echo PostgreSQL major version: $PGVERSION
 
 # pgpool-II configuration file localtion.


[parent: 6f2b4b1df869]