From 038f5d4b4223412f4d74ab81ddb74d9257f05a6e Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 12 Mar 2023 10:26:32 +0200
Subject: [PATCH 5/5] Msys2: Distinguish registry keys and directories from
 msys1 ones

Namespace registry keys and install directories so they
don't get overwritten by parallel installations.

See osdn #47568

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh  | 6 +++---
 win32/installer_msys2/create-freeciv-ruledit-nsi.sh | 6 +++---
 win32/installer_msys2/create-freeciv-sdl2-nsi.sh    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh b/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh
index 738a4f1e1c..cbc0bfc08e 100644
--- a/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh
+++ b/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh
@@ -8,11 +8,11 @@ else
   MPGUI_ID="$3"
 fi
 
-ARCH_KEY_PART="$5"
+ARCH_KEY_PART="msys2${5}"
 if test "$5" != "win32" && test "$5" != "win64" ; then
-  ARCH_INST_PART="-${ARCH_KEY_PART}"
+  ARCH_INST_PART="-msys2-${5}"
 else
-  ARCH_INST_PART=""
+  ARCH_INST_PART="-msys2"
 fi
 
 cat <<EOF
diff --git a/win32/installer_msys2/create-freeciv-ruledit-nsi.sh b/win32/installer_msys2/create-freeciv-ruledit-nsi.sh
index e2674fcd2d..17aa7a6ac0 100644
--- a/win32/installer_msys2/create-freeciv-ruledit-nsi.sh
+++ b/win32/installer_msys2/create-freeciv-ruledit-nsi.sh
@@ -2,11 +2,11 @@
 
 # ./create-freeciv-ruledit.sh <Freeciv files directory> <version> <win32|win64|win>
 
-ARCH_KEY_PART="$3"
+ARCH_KEY_PART="msys2${3}"
 if test "$3" != "win32" && test "$3" != "win64" ; then
-  ARCH_INST_PART="-${ARCH_KEY_PART}"
+  ARCH_INST_PART="-msys2-${3}"
 else
-  ARCH_INST_PART=""
+  ARCH_INST_PART="-msys2"
 fi
 
 cat <<EOF
diff --git a/win32/installer_msys2/create-freeciv-sdl2-nsi.sh b/win32/installer_msys2/create-freeciv-sdl2-nsi.sh
index 37e17c8dca..dc69fa27ae 100644
--- a/win32/installer_msys2/create-freeciv-sdl2-nsi.sh
+++ b/win32/installer_msys2/create-freeciv-sdl2-nsi.sh
@@ -2,11 +2,11 @@
 
 # ./create-freeciv-sdl2-nsi.sh <Freeciv files directory> <version> <win32|win64|win>
 
-ARCH_KEY_PART="$3"
+ARCH_KEY_PART="msys2${3}"
 if test "$3" != "win32" && test "$3" != "win64" ; then
-  ARCH_INST_PART="-${ARCH_KEY_PART}"
+  ARCH_INST_PART="-msys2-${3}"
 else
-  ARCH_INST_PART=""
+  ARCH_INST_PART="-msys2"
 fi
 
 cat <<EOF
-- 
2.39.2