Merge pull request #2409 from sandboxie-plus/Sbie_installer

Improve removal of leftovers
sandboxie-plus · Oct 28, 2022 · 7d86aa2 · 7d86aa2
2 parents a3babdc + 6954e3c
commit 7d86aa2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Installer/Sandboxie-Plus.iss b/Installer/Sandboxie-Plus.iss
@@ -83,6 +83,7 @@ Type: files; Name: "{app}\translations\sandman_pt.qm"
 Type: files; Name: "{app}\translations\sandman_ua.qm"
 Type: files; Name: "{app}\SbieDrv.sys.w10"
 Type: files; Name: "{app}\SbieDrv.sys.rc4"
+Type: files; Name: "{app}\SbieIni.exe.sig"
 
 
 [Registry]

diff --git a/Sandboxie/install/SandboxieVS.nsi b/Sandboxie/install/SandboxieVS.nsi
@@ -1044,7 +1044,7 @@ WriteLoop:
 
     File /oname=${START_EXE} "${BIN_ROOT}\Start.exe"
     File /oname=${START_EXE}.sig "${BIN_ROOT}\Start.exe.sig"
-    
+
     File /oname=${SBIECTRL_EXE} "${BIN_ROOT}\SbieCtrl.exe"
     File /oname=${SBIECTRL_EXE}.sig "${BIN_ROOT}\SbieCtrl.exe.sig"
 
@@ -1108,6 +1108,9 @@ SkipCopyInstaller:
 
     Delete "$DESKTOP\${PRODUCT_NAME} Quick Launch.lnk"
     Delete "$QUICKLAUNCH\${PRODUCT_NAME} Quick Launch.lnk"
+    Delete "$INSTDIR\${SBIEDRV_SYS}.rc4"
+    Delete "$INSTDIR\${SBIEDRV_SYS}.w10"
+    Delete "$INSTDIR\${SBIEINI_EXE}.sig"
 
 FunctionEnd
 
@@ -1139,8 +1142,8 @@ Function DeleteProgramFiles
     Delete "$INSTDIR\${SBIEMSG_DLL}"
 
     Delete "$INSTDIR\${SBIEDRV_SYS}"
-;    Delete "$INSTDIR\${SBIEDRV_SYS4}"
-;    Delete "$INSTDIR\${SBIEDRV_SYSX}"
+    Delete "$INSTDIR\${SBIEDRV_SYS}.rc4" ; leftover
+    Delete "$INSTDIR\${SBIEDRV_SYS}.w10" ; leftover
 
     Delete "$INSTDIR\KmdUtil.exe"
 
@@ -1168,6 +1171,7 @@ Function DeleteProgramFiles
     Delete "$INSTDIR\Manifest2.txt"
 
     Delete "$INSTDIR\${SBIEINI_EXE}"
+    Delete "$INSTDIR\${SBIEINI_EXE}.sig" ; leftover
 
     Delete "$INSTDIR\LICENSE.EXE"