From 40f456aca3a568a09a5bec275b36a79869ce8bef Mon Sep 17 00:00:00 2001
From: "Earle F. Philhower, III" <earlephilhower@yahoo.com>
Date: Tue, 15 Oct 2019 09:21:18 -0700
Subject: [PATCH] Dynamically find the Python3 dir on Windows (#6646)

Windows installers place each version of Python in their own, uniquely
named directory.  Can't programatically override w/free Chocolatey, so
use the shell and figure it where it installed it dynamically.
---
 tests/common.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/common.sh b/tests/common.sh
index c5184cece..bf329b3ac 100755
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -166,9 +166,12 @@ function install_ide()
     local debug=$3
     if [ "$WINDOWS" = "1" ]; then
         # Acquire needed packages from Windows package manager
-        choco install --no-progress python3
-        export PATH="/c/Python37:$PATH"  # Ensure it's live from now on...
-        cp /c/Python37/python.exe /c/Python37/python3.exe
+        choco install --no-progress python3 >& pylog.txt
+	# Parse the python instrall dir from the output log.  Sorry, can't set it via choco on the free version
+	PYDIR=$(cat pylog.txt | grep "^Installed to:"  | cut -f2 -d"'" | sed 's/C:\\/\/c\//')
+	echo "Detected python3 install dir: $PYDIR"
+        export PATH="$PYDIR:$PATH"  # Ensure it's live from now on...
+        cp "$PYDIR/python.exe" "$PYDIR/python3.exe"
         choco install --no-progress unzip
         choco install --no-progress sed
         #choco install --no-progress golang