From e47fe609a64602dd33c5cb62bdeacdcd39d179e7 Mon Sep 17 00:00:00 2001 From: max Date: Sat, 26 Sep 2026 19:58:15 +0200 Subject: [PATCH] fix(installer): ensure complete cleanup of certs, configs, database, logs, and directories upon uninstallation --- compilation/installer_client.iss | 9 +++++++++ compilation/installer_client.nsi | 7 ++++++- compilation/installer_server.iss | 10 ++++++++++ compilation/installer_server.nsi | 8 +++++++- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/compilation/installer_client.iss b/compilation/installer_client.iss index b5fc635..210cbca 100644 --- a/compilation/installer_client.iss +++ b/compilation/installer_client.iss @@ -26,3 +26,12 @@ Filename: "{app}\nssm.exe"; Parameters: "start LOGAR_Client"; Flags: runhidden [UninstallRun] Filename: "{app}\nssm.exe"; Parameters: "stop LOGAR_Client"; Flags: runhidden Filename: "{app}\nssm.exe"; Parameters: "remove LOGAR_Client confirm"; Flags: runhidden + +[UninstallDelete] +Type: filesandordirs; Name: "{app}\certs" +Type: files; Name: "{app}\client_config.json" +Type: files; Name: "{app}\client_state.json" +Type: files; Name: "{app}\*.log" +Type: filesandordirs; Name: "{app}\runtime" +Type: filesandordirs; Name: "{app}" +Type: filesandordirs; Name: "{commonappdata}\LOGAR" diff --git a/compilation/installer_client.nsi b/compilation/installer_client.nsi index 1499722..28b1b24 100644 --- a/compilation/installer_client.nsi +++ b/compilation/installer_client.nsi @@ -37,8 +37,13 @@ Section "Uninstall" ExecWait '"$INSTDIR\nssm.exe" stop LOGAR_Client' ExecWait '"$INSTDIR\nssm.exe" remove LOGAR_Client confirm' RMDir /r "$INSTDIR\runtime" + RMDir /r "$INSTDIR\certs" + Delete "$INSTDIR\client_config.json" + Delete "$INSTDIR\client_state.json" + Delete "$INSTDIR\*.log" Delete "$INSTDIR\Win_Client.exe" Delete "$INSTDIR\nssm.exe" Delete "$INSTDIR\uninstall.exe" - RMDir "$INSTDIR" + RMDir /r "$INSTDIR" + RMDir /r "$COMMONAPPDATA\LOGAR" SectionEnd diff --git a/compilation/installer_server.iss b/compilation/installer_server.iss index 1e9fd55..48e5e05 100644 --- a/compilation/installer_server.iss +++ b/compilation/installer_server.iss @@ -26,3 +26,13 @@ Filename: "{app}\nssm.exe"; Parameters: "start LOGAR_Server"; Flags: runhidden [UninstallRun] Filename: "{app}\nssm.exe"; Parameters: "stop LOGAR_Server"; Flags: runhidden Filename: "{app}\nssm.exe"; Parameters: "remove LOGAR_Server confirm"; Flags: runhidden + +[UninstallDelete] +Type: filesandordirs; Name: "{app}\certs" +Type: files; Name: "{app}\server_config.json" +Type: files; Name: "{app}\logar_state.db" +Type: files; Name: "{app}\logar_state.db-*" +Type: files; Name: "{app}\*.log" +Type: filesandordirs; Name: "{app}\runtime" +Type: filesandordirs; Name: "{app}" +Type: filesandordirs; Name: "{commonappdata}\LOGAR-Server" diff --git a/compilation/installer_server.nsi b/compilation/installer_server.nsi index 5b450f3..4e5eac9 100644 --- a/compilation/installer_server.nsi +++ b/compilation/installer_server.nsi @@ -37,8 +37,14 @@ Section "Uninstall" ExecWait '"$INSTDIR\nssm.exe" stop LOGAR_Server' ExecWait '"$INSTDIR\nssm.exe" remove LOGAR_Server confirm' RMDir /r "$INSTDIR\runtime" + RMDir /r "$INSTDIR\certs" + Delete "$INSTDIR\server_config.json" + Delete "$INSTDIR\logar_state.db" + Delete "$INSTDIR\logar_state.db-*" + Delete "$INSTDIR\*.log" Delete "$INSTDIR\Server.exe" Delete "$INSTDIR\nssm.exe" Delete "$INSTDIR\uninstall.exe" - RMDir "$INSTDIR" + RMDir /r "$INSTDIR" + RMDir /r "$COMMONAPPDATA\LOGAR-Server" SectionEnd