Merge pull request #545 from percona/release-2.2.0

PGSM 2.2.0 release

META.json

@@ -2,7 +2,7 @@
    "name": "pg_stat_monitor",
    "abstract": "PostgreSQL Query Performance Monitoring Tool",
    "description": "pg_stat_monitor is a PostgreSQL Query Performance Monitoring tool, based on PostgreSQL's contrib module pg_stat_statements. PostgreSQL’s pg_stat_statements provides the basic statistics, which is sometimes not enough. The major shortcoming in pg_stat_statements is that it accumulates all the queries and their statistics and does not provide aggregated statistics nor histogram information. In this case, a user would need to calculate the aggregates, which is quite an expensive operation.",
-   "version": "2.1.1",
+   "version": "2.2.0",
    "maintainer": [
       "Artem Gavrilov <artem.gavrilov@percona.com>",
       "Diego dos Santos Fronza <diego.fronza@percona.com>"
@@ -13,9 +13,9 @@
    "provides": {
       "pg_stat_monitor": {
          "abstract": "PostgreSQL Query Performance Monitoring Tool",
-         "file": "pg_stat_monitor--2.0--2.1.sql",
+         "file": "pg_stat_monitor--2.1--2.2.sql",
          "docfile": "README.md",
-         "version": "2.1.1"
+         "version": "2.2.0"
       }
    },
    "prereqs": {

percona-packaging/scripts/pg_stat_monitor_builder.sh

@@ -117,9 +117,13 @@ get_sources(){
         echo "Sources will not be downloaded"
         return 0
     fi
+    IS_RELEASE_BRANCH=$(echo ${VERSION} | grep -c release)
+    if [ ${IS_RELEASE_BRANCH} != 0 ]; then
+        VERSION=$(echo $VERSION | awk -F'-' '{print $2}')
+    fi
     PRODUCT=percona-pg-stat-monitor${PG_RELEASE}
     PRODUCT_FULL=${PRODUCT}-${VERSION}
-
+    
     echo "PRODUCT=${PRODUCT}" > pg-stat-monitor.properties
     echo "PRODUCT_FULL=${PRODUCT_FULL}" >> pg-stat-monitor.properties
     echo "VERSION=${VERSION}" >> pg-stat-monitor.properties