Merge pull request #495 from hhorak/unamefix

Replace uname -i/-p with -m

Author: phracek

10/root/usr/share/container-scripts/postgresql/common.sh

@@ -130,7 +130,7 @@ version2number ()
 # These cases are: non-intel architectures, and version higher or equal 12.0, 10.7, 9.6.12
 # Return value 0 means the hack is needed.
 function should_hack_data_sync_retry() {
-  [ "$(uname -p)" == 'x86_64' ] && return 1
+  [ "$(uname -m)" == 'x86_64' ] && return 1
   local version_number=$(version2number "$(pg_ctl -V | sed -e 's/^pg_ctl (PostgreSQL) //')")
   # this matches all 12.x and versions of 10.x where we need the hack
   [ "$version_number" -ge 100700 ] && return 0

12/root/usr/share/container-scripts/postgresql/common.sh

@@ -130,7 +130,7 @@ version2number ()
 # These cases are: non-intel architectures, and version higher or equal 12.0, 10.7, 9.6.12
 # Return value 0 means the hack is needed.
 function should_hack_data_sync_retry() {
-  [ "$(uname -p)" == 'x86_64' ] && return 1
+  [ "$(uname -m)" == 'x86_64' ] && return 1
   local version_number=$(version2number "$(pg_ctl -V | sed -e 's/^pg_ctl (PostgreSQL) //')")
   # this matches all 12.x and versions of 10.x where we need the hack
   [ "$version_number" -ge 100700 ] && return 0

13/root/usr/share/container-scripts/postgresql/common.sh

@@ -130,7 +130,7 @@ version2number ()
 # These cases are: non-intel architectures, and version higher or equal 12.0, 10.7, 9.6.12
 # Return value 0 means the hack is needed.
 function should_hack_data_sync_retry() {
-  [ "$(uname -p)" == 'x86_64' ] && return 1
+  [ "$(uname -m)" == 'x86_64' ] && return 1
   local version_number=$(version2number "$(pg_ctl -V | sed -e 's/^pg_ctl (PostgreSQL) //')")
   # this matches all 12.x and versions of 10.x where we need the hack
   [ "$version_number" -ge 100700 ] && return 0

15/root/usr/share/container-scripts/postgresql/common.sh

@@ -130,7 +130,7 @@ version2number ()
 # These cases are: non-intel architectures, and version higher or equal 12.0, 10.7, 9.6.12
 # Return value 0 means the hack is needed.
 function should_hack_data_sync_retry() {
-  [ "$(uname -p)" == 'x86_64' ] && return 1
+  [ "$(uname -m)" == 'x86_64' ] && return 1
   local version_number=$(version2number "$(pg_ctl -V | sed -e 's/^pg_ctl (PostgreSQL) //')")
   # this matches all 12.x and versions of 10.x where we need the hack
   [ "$version_number" -ge 100700 ] && return 0

src/root/usr/share/container-scripts/postgresql/common.sh

@@ -131,7 +131,7 @@ version2number ()
 # These cases are: non-intel architectures, and version higher or equal 12.0, 10.7, 9.6.12
 # Return value 0 means the hack is needed.
 function should_hack_data_sync_retry() {
-  [ "$(uname -p)" == 'x86_64' ] && return 1
+  [ "$(uname -m)" == 'x86_64' ] && return 1
   local version_number=$(version2number "$(pg_ctl -V | sed -e 's/^pg_ctl (PostgreSQL) //')")
   # this matches all 12.x and versions of 10.x where we need the hack
   [ "$version_number" -ge 100700 ] && return 0

test/run_test

@@ -693,7 +693,7 @@ run_migration_test ()
 
     local from_version
     # Only test a subset of the migration path on non-intel hosts
-    if [ "$(uname -i)" == "x86_64" ]; then
+    if [ "$(uname -m)" == "x86_64" ]; then
         local upgrade_path="9.2 9.4 9.5 9.6 10 12 13 15"
     else
         local upgrade_path="10 12 13 15"