From 9dc77315307691ae63c40e8aafd2c4f508c33239 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 31 Mar 2023 06:22:01 +0300
Subject: [PATCH 54/54] installer_cross uninstaller: Delete Registry Values

We only tried to delete Registry Keys on the condition that
they are empty. They never were as we had removed the values.

See osdn #47713

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

diff --git a/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh b/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
index b890974518..68b43549ae 100755
--- a/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
+++ b/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
@@ -349,6 +349,8 @@ cat <<EOF
 
   ; Remove registry keys
   DeleteRegKey "SHCTX" "Software\Microsoft\Windows\CurrentVersion\Uninstall\\\${APPID}"
+  DeleteRegValue "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION}\\\${GUI_ID} ""
+  DeleteRegValue "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION}\\\${GUI_ID} "Start Menu Folder"
   DeleteRegKey /ifempty "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION}\\\${GUI_ID}
   DeleteRegKey /ifempty "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION}
   DeleteRegKey /ifempty "SHCTX" SOFTWARE\\\${APPNAME}
diff --git a/windows/installer_cross/create-freeciv-ruledit-nsi.sh b/windows/installer_cross/create-freeciv-ruledit-nsi.sh
index d3687f1bfc..3d1dc0c5ad 100755
--- a/windows/installer_cross/create-freeciv-ruledit-nsi.sh
+++ b/windows/installer_cross/create-freeciv-ruledit-nsi.sh
@@ -311,6 +311,8 @@ cat <<EOF
 
   ; Remove registry keys
   DeleteRegKey "SHCTX" "Software\Microsoft\Windows\CurrentVersion\Uninstall\\\${APPID}"
+  DeleteRegValue "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION} ""
+  DeleteRegValue "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION} "Start Menu Folder"
   DeleteRegKey /ifempty "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION}
   DeleteRegKey /ifempty "SHCTX" SOFTWARE\\\${APPNAME}
 SectionEnd
diff --git a/windows/installer_cross/create-freeciv-sdl2-nsi.sh b/windows/installer_cross/create-freeciv-sdl2-nsi.sh
index f8b6c6d3e8..40a0a1ba65 100755
--- a/windows/installer_cross/create-freeciv-sdl2-nsi.sh
+++ b/windows/installer_cross/create-freeciv-sdl2-nsi.sh
@@ -353,6 +353,8 @@ cat <<EOF
 
   ; Remove registry keys
   DeleteRegKey "SHCTX" "Software\Microsoft\Windows\CurrentVersion\Uninstall\\\${APPID}"
+  DeleteRegValue "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION}\\\${GUI_ID} ""
+  DeleteRegValue "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION}\\\${GUI_ID} "Start Menu Folder"
   DeleteRegKey /ifempty "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION}\\\${GUI_ID}
   DeleteRegKey /ifempty "SHCTX" SOFTWARE\\\${APPNAME}\\\${VERSION}
   DeleteRegKey /ifempty "SHCTX" SOFTWARE\\\${APPNAME}
-- 
2.39.2