Merge pull request #9 from uptimejp/fix/python27

Fix for Ubuntu 14.04 LTS and CentOS 7 with Python 2.7.

bin/pt-config

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-config

bin/pt-index-usage

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-index-usage

bin/pt-kill

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-kill

bin/pt-proc-stat

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-proc-stat

bin/pt-replication-stat

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-replication-stat

bin/pt-session-profiler

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-session-profiler

bin/pt-set-tablespace

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-set-tablespace

bin/pt-snap-statements

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-snap-statements

bin/pt-stat-snapshot

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-stat-snapshot

bin/pt-table-usage

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-table-usage

bin/pt-tablespace-usage

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-tablespace-usage

bin/pt-verify-checksum

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-verify-checksum

bin/pt-xact-stat

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # pt-xact-stat

bin/t/regress.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 _PATH=$PATH
 LANG=C
@@ -123,27 +123,67 @@ echo "wal_level = 'hot_standby'" >> _postgresql.conf
 echo "wal_keep_segments = 8" >> _postgresql.conf
 echo "max_wal_senders = 2" >> _postgresql.conf
 echo "hot_standby = on" >> _postgresql.conf
-testsuite /usr/pgsql-9.0 ./data90 ./out90
+if [ -d /usr/pgsql-9.0 ]; then
+  # RHEL/CentOS
+  testsuite /usr/pgsql-9.0 ./data90 ./out90
+elif [ -d /usr/lib/postgresql/9.0 ]; then
+  # Ubuntu
+  testsuite /usr/lib/postgresql/9.0 ./data90 ./out90
+else
+  echo "passing the regression tests for 9.0"
+fi
 
 # -------------------------------------------------------
 # 9.1
 # -------------------------------------------------------
-testsuite /usr/pgsql-9.1 ./data91 ./out91
+if [ -d /usr/pgsql-9.1 ]; then
+  # RHEL/CentOS
+  testsuite /usr/pgsql-9.1 ./data91 ./out91
+elif [ -d /usr/lib/postgresql/9.1 ]; then
+  # Ubuntu
+  testsuite /usr/lib/postgresql/9.1 ./data91 ./out91
+else
+  echo "passing the regression tests for 9.1"
+fi
 
 # -------------------------------------------------------
 # 9.2
 # -------------------------------------------------------
 echo "track_io_timing = on" >> _postgresql.conf
-testsuite /usr/pgsql-9.2 ./data92 ./out92
+if [ -d /usr/pgsql-9.2 ]; then
+  # RHEL/CentOS
+  testsuite /usr/pgsql-9.2 ./data92 ./out92
+elif [ -d /usr/lib/postgresql/9.2 ]; then
+  # Ubuntu
+  testsuite /usr/lib/postgresql/9.2 ./data92 ./out92
+else
+  echo "passing the regression tests for 9.2"
+fi
 
 # -------------------------------------------------------
 # 9.3
 # -------------------------------------------------------
 # Checksum support
 _INITDB_OPTS="-k"
-testsuite /usr/pgsql-9.3 ./data93 ./out93
+if [ -d /usr/pgsql-9.3 ]; then
+  # RHEL/CentOS
+  testsuite /usr/pgsql-9.3 ./data93 ./out93
+elif [ -d /usr/lib/postgresql/9.3 ]; then
+  # Ubuntu
+  testsuite /usr/lib/postgresql/9.3 ./data93 ./out93
+else
+  echo "passing the regression tests for 9.3"
+fi
 
 # -------------------------------------------------------
 # 9.4
 # -------------------------------------------------------
-testsuite /usr/pgsql-9.4 ./data94 ./out94
+if [ -d /usr/pgsql-9.4 ]; then
+  # RHEL/CentOS
+  testsuite /usr/pgsql-9.4 ./data94 ./out94
+elif [ -d /usr/lib/postgresql/9.4 ]; then
+  # Ubuntu
+  testsuite /usr/lib/postgresql/9.4 ./data94 ./out94
+else
+  echo "passing the regression tests for 9.4"
+fi

bin/t/test-pt-config.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH

bin/t/test-pt-index-usage.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH

bin/t/test-pt-kill.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH

bin/t/test-pt-proc-stat.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH

bin/t/test-pt-replication-stat.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH
@@ -16,11 +16,7 @@ function setUp()
 
     pgbench -i >> setUp.log 2>&1
 
-    if [ -f $PGHOME/share/contrib/pg_stat_statements.sql ]; then
-	psql -f $PGHOME/share/contrib/pg_stat_statements.sql >> setUp.log 2>&1
-    else
-	psql -c 'create extension pg_stat_statements' >> setUp.log 2>&1
-    fi
+    install_pg_stat_statements >> setUp.log 2>&1
 }
 
 function testReplicationStat001()

bin/t/test-pt-session-profiler.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH

bin/t/test-pt-set-tablespace.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH

bin/t/test-pt-snap-statements.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH
@@ -16,11 +16,7 @@ function setUp()
 
     pgbench -i >> setUp.log 2>&1
 
-    if [ -f $PGHOME/share/contrib/pg_stat_statements.sql ]; then
-	psql -f $PGHOME/share/contrib/pg_stat_statements.sql >> setUp.log 2>&1
-    else
-	psql -c 'create extension pg_stat_statements' >> setUp.log 2>&1
-    fi
+    install_pg_stat_statements >> setUp.log 2>&1
 
     psql -c 'select pg_stat_statements_reset()' >> setUp.log 2>&1
 }

bin/t/test-pt-stat-snapshot.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH
@@ -12,16 +12,9 @@ function setUp()
 #    echo "PATH=$PATH"
 #    echo "PGHOME=$PGHOME"
 #    echo "PGDATA=$PGDATA"
-    if [ -f $PGHOME/share/contrib/pg_stat_statements.sql ]; then
-        psql -f $PGHOME/share/contrib/pg_stat_statements.sql >> setUp.log 2>&1
-    else
-        psql -c 'create extension pg_stat_statements' >> setUp.log 2>&1
-    fi
-    if [ -f $PGHOME/share/contrib/pgstattuple.sql ]; then
-        psql -f $PGHOME/share/contrib/pgstattuple.sql >> setUp.log 2>&1
-    else
-        psql -c 'create extension pgstattuple' >> setUp.log 2>&1
-    fi
+
+    install_pg_stat_statements >> setUp.log 2>&1
+    install_pgstattuple >> setUp.log 2>&1
 
     ps auxx > setUp.log
 }

bin/t/test-pt-table-usage.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH

bin/t/test-pt-tablespace-usage.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH

bin/t/test-pt-verify-checksum.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH

bin/t/test-pt-xact-stat.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=$PATH:..:../../deps/shunit2-2.1.6/src
 export PATH

bin/t/test_common.sh

@@ -19,3 +19,26 @@ function contains()
     fi
 }
 
+function install_pg_stat_statements()
+{
+    _SHARE_DIR=`$PGHOME/bin/pg_config --sharedir`
+
+    if [ -f $_SHARE_DIR/contrib/pg_stat_statements.sql ]; then
+	psql -f $_SHARE_DIR/contrib/pg_stat_statements.sql
+    else
+	psql -c 'create extension pg_stat_statements'
+    fi
+}
+
+function install_pgstattuple()
+{
+    _SHARE_DIR=`$PGHOME/bin/pg_config --sharedir`
+
+    if [ -f $_SHARE_DIR/contrib/pgstattuple.sql ]; then
+	psql -f $_SHARE_DIR/contrib/pgstattuple.sql
+    else
+	psql -c 'create extension pgstattuple'
+    fi
+}
+
+

docs/en/install.rst

@@ -8,10 +8,11 @@ Supported OS
 
 For a list of Operating System supported.
 
-* Red Hat Enterprise Linux 6
-* CentOS 6
+* Red Hat Enterprise Linux 6 / CentOS 6
+* Red Hat Enterprise Linux 7 / CentOS 7
+* Ubuntu 14.04 LTS
 
-Make sure you have Python2.6 is installed.
+Make sure you have Python2.6 or Python2.7 is installed.
 
 
 PostgreSQL Version

docs/ja/install.rst

@@ -8,10 +8,11 @@
 
 サポートされているOSとそのバージョンは以下の通りです。
 
-* Red Hat Enterprise Linux 6
-* CentOS 6
+* Red Hat Enterprise Linux 6 / CentOS 6
+* Red Hat Enterprise Linux 7 / CentOS 7
+* Ubuntu 14.04 LTS
 
-なお、Python2.6がインストールされている必要があります。
+なお、Python2.6またはPython2.7がインストールされている必要があります。
 
 
 PostgreSQLバージョン

lib/DirectoryTree.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # DirectoryTree

lib/PsqlWrapper.py

@@ -1,4 +1,4 @@
-#!/bin/env python2.6
+#!/bin/env python
 # coding: UTF-8
 
 # PsqlWrapper

lib/TcpdumpWrapper.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # TcpdumpWrapper

lib/log.py

@@ -1,4 +1,4 @@
-#!/bin/env python2.6
+#!/bin/env python
 # coding: UTF-8
 
 # log

lib/testDirectoryTree.py

@@ -1,4 +1,4 @@
-#!/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # testDirectoryTree

lib/testLog.py

@@ -1,4 +1,4 @@
-#!/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # testLog

lib/testPsqlWrapper.py

@@ -1,4 +1,4 @@
-#!/bin/env python2.6
+#!/usr/bin/env python
 # coding: UTF-8
 
 # testPsqlWrapper