From 5c30c86963e309bb4cb20e8950e2c2c330489dee Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 25 Nov 2023 22:05:24 +0100 Subject: [PATCH 1/1] Extract some common parts of the uninstaller. --- platform/windows/wscript | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/platform/windows/wscript b/platform/windows/wscript index eb32596ac..e5a54c94e 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -462,14 +462,14 @@ SectionEnd !insertmacro MUI_LANGUAGE "English" """, file=f) - if debug: - print(""" + print(""" Section "Uninstall" RMDir /r "$INSTDIR\\*.*" RMDir "$INSTDIR" -Delete "$DESKTOP\\DCP-o-matic 2 debug.lnk" - """, file=f) + """, file=f) + if debug: + print('Delete "$DESKTOP\\DCP-o-matic 2 debug.lnk"', file=f) for s, l in tools: print('Delete "$DESKTOP\\DCP-o-matic 2 %s debug.lnk"' % l, file=f) @@ -481,13 +481,7 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\U SectionEnd """, file=f) else: - print(""" -Section "Uninstall" -RMDir /r "$INSTDIR\\*.*" -RMDir "$INSTDIR" -Delete "$DESKTOP\\DCP-o-matic 2.lnk" - """, file=f) - + print('Delete "$DESKTOP\\DCP-o-matic 2.lnk"', file=f) for s, l in tools: print('Delete "$DESKTOP\\DCP-o-matic 2 %s.lnk"' % l) -- 2.30.2