From: Andrew Dunstan <andrew@dunslane.net>
Date: Fri, 4 May 2018 18:54:04 +0000 (-0400)
Subject: Allow MSYS as well as MINGW in Msys uname
X-Git-Tag: REL9_4_18~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ade3b273caeefc9ec51355607679f913606eab1b;p=thirdparty%2Fpostgresql.git

Allow MSYS as well as MINGW in Msys uname

Msys2's uname -s outputs a string beginning MSYS rather than MINGW as is
output by Msys. Allow either in pg_upgrade's test.sh.

Backpatch to all live branches.
---

diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index eac50464e1b..4b4998ef1d9 100644
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/pg_upgrade/test.sh
@@ -32,7 +32,7 @@ standard_initdb() {
 testhost=`uname -s`
 
 case $testhost in
-	MINGW*)
+	MINGW*|MSYS*)
 		LISTEN_ADDRESSES="localhost"
 		PGHOST=localhost
 		;;