From d171dd35e576001b16257f9818d0169863c3394b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= <toilal.dev@gmail.com>
Date: Wed, 9 Sep 2020 01:12:27 +0200
Subject: [PATCH] Rename TARGETDIR for wine installation of Python

---
 Dockerfile-py3-xenial-win32 | 16 ++++++++--------
 Dockerfile-py3-xenial-win64 | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Dockerfile-py3-xenial-win32 b/Dockerfile-py3-xenial-win32
index 89787b0..1642cb1 100644
--- a/Dockerfile-py3-xenial-win32
+++ b/Dockerfile-py3-xenial-win32
@@ -37,17 +37,17 @@ RUN set -x \
     && winetricks win7 \
     && for msifile in `echo core dev exe lib path pip tcltk tools`; do \
         wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/win32/${msifile}.msi"; \
-        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python37; \
+        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python; \
         rm ${msifile}.msi; \
     done \
-    && cd /wine/drive_c/Python37 \
-    && echo 'wine '\''C:\Python37\python.exe'\'' "$@"' > /usr/bin/python \
-    && echo 'wine '\''C:\Python37\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
-    && echo 'wine '\''C:\Python37\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
-    && echo 'wine '\''C:\Python37\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
-    && echo 'wine '\''C:\Python37\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
+    && cd /wine/drive_c/Python \
+    && echo 'wine '\''C:\Python\python.exe'\'' "$@"' > /usr/bin/python \
+    && echo 'wine '\''C:\Python\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
+    && echo 'wine '\''C:\Python\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
+    && echo 'wine '\''C:\Python\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
+    && echo 'wine '\''C:\Python\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
     && echo 'assoc .py=PythonScript' | wine cmd \
-    && echo 'ftype PythonScript=c:\Python37\python.exe "%1" %*' | wine cmd \
+    && echo 'ftype PythonScript=c:\Python\python.exe "%1" %*' | wine cmd \
     && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \
     && chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyinstaller /usr/bin/pyupdater \
     && (pip install -U pip || true) \
diff --git a/Dockerfile-py3-xenial-win64 b/Dockerfile-py3-xenial-win64
index e98284e..93f25c9 100644
--- a/Dockerfile-py3-xenial-win64
+++ b/Dockerfile-py3-xenial-win64
@@ -37,17 +37,17 @@ RUN set -x \
     && winetricks win7 \
     && for msifile in `echo core dev exe lib path pip tcltk tools`; do \
         wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/amd64/${msifile}.msi"; \
-        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python37; \
+        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python; \
         rm ${msifile}.msi; \
     done \
-    && cd /wine/drive_c/Python37 \
-    && echo 'wine '\''C:\Python37\python.exe'\'' "$@"' > /usr/bin/python \
-    && echo 'wine '\''C:\Python37\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
-    && echo 'wine '\''C:\Python37\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
-    && echo 'wine '\''C:\Python37\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
-    && echo 'wine '\''C:\Python37\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
+    && cd /wine/drive_c/Python \
+    && echo 'wine '\''C:\Python\python.exe'\'' "$@"' > /usr/bin/python \
+    && echo 'wine '\''C:\Python\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
+    && echo 'wine '\''C:\Python\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
+    && echo 'wine '\''C:\Python\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
+    && echo 'wine '\''C:\Python\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
     && echo 'assoc .py=PythonScript' | wine cmd \
-    && echo 'ftype PythonScript=c:\Python37\python.exe "%1" %*' | wine cmd \
+    && echo 'ftype PythonScript=c:\Python\python.exe "%1" %*' | wine cmd \
     && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \
     && chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyinstaller /usr/bin/pyupdater \
     && (pip install -U pip || true) \