[open-ils-commits] [GIT] Evergreen ILS branch master updated. 73a18745da1e0a6340e84233d57f4bb42ec66d37

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  73a18745da1e0a6340e84233d57f4bb42ec66d37 (commit)
      from  689171ab8e35da2ab7ef5e89c7e1dade3f38a753 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 73a18745da1e0a6340e84233d57f4bb42ec66d37
Author: Ben Shum <ben at evergreener.net>
Date:   Tue Nov 7 15:09:47 2017 -0500

    LP#1730721: future proof build-db.sh (followup)
    
    For PostgreSQL 10+, the versioning scheme has changed. We only want
    the top number for those versions and up.
    
    So, grab only the first two numbers for the variable...
    
    9.6.5 = 96
    10.0 = 10, etc.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/sql/Pg/build-db.sh b/Open-ILS/src/sql/Pg/build-db.sh
index 4eb7be0..4b8df82 100755
--- a/Open-ILS/src/sql/Pg/build-db.sh
+++ b/Open-ILS/src/sql/Pg/build-db.sh
@@ -15,7 +15,7 @@ export PGHOST PGPORT PGDATABASE PGUSER PGPASSWORD
 # ---------------------------------------------------------------------------
 # Lookup the database version from the PostgreSQL server.
 # ---------------------------------------------------------------------------
-DB_VERSION=`psql -qtc 'show server_version;' | xargs | cut -d. -f 1,2 | tr -d '.'`
+DB_VERSION=`psql -qtc 'show server_version;' | xargs | cut -d. -f 1,2 | tr -d '.' | cut -c1,2`
 if [ -z "$DB_VERSION" ] || [ `echo $DB_VERSION | grep -c '[^0-9]'` != 0 ]; then
   cat <<EOM
 ********************************************************************************

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/build-db.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS