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: REL_10_4~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d03cf45fd97d0e6759c5862d04f8bde0a4d27575;p=postgresql

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/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index f4556341f3..31a8581b14 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -32,7 +32,7 @@ standard_initdb() {
 testhost=`uname -s`
 
 case $testhost in
-	MINGW*)
+	MINGW*|MSYS*)
 		LISTEN_ADDRESSES="localhost"
 		PGHOST=localhost
 		;;