R6.11: the Windows installer removes an older install's files first

Upgrades kept ElyMark's old git folder and CEF files. The installer
now runs the uninstaller's file list before copying, only when the
folder already holds this app's exe.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ZacharyZhang-NYandClaude Opus 5.5 committed 2026-10-15 15:44:03 -04:00
1 parent a0269294e6
commit 5dafa432f6
3 files changed
+24 -15

No files matched your search

+22 -14
View File
@@ -45,7 +45,28 @@ SetCompressor /SOLID lzma
LangString DeleteData ${LANG_SIMPCHINESE} "同时删除 ${APP_NAME} 的缓存、账号与本地历史吗?你的文档不受影响。"
LangString DeleteData ${LANG_ENGLISH} "Also delete the cache, accounts and local history of ${APP_NAME}? Your documents stay."
!macro ElyRemoveFiles
; What stage.sh lays out, and nothing else.
RMDir /r "$INSTDIR\libreoffice"
RMDir /r "$INSTDIR\tessdata"
RMDir /r "$INSTDIR\git"
RMDir /r "$INSTDIR\content"
RMDir /r "$INSTDIR\locales"
RMDir /r "$INSTDIR\licenses"
Delete "$INSTDIR\*.exe"
Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\*.pak"
Delete "$INSTDIR\*.bin"
Delete "$INSTDIR\*.dat"
Delete "$INSTDIR\*.json"
Delete "$INSTDIR\${APP_SLUG}.ico"
!macroend
Section "Install"
; An older install's files go first, so none linger.
IfFileExists "$INSTDIR\${APP_SLUG}.exe" 0 fresh
!insertmacro ElyRemoveFiles
fresh:
SetOutPath "$INSTDIR"
File /r "${STAGE}\*.*"
File "/oname=${APP_SLUG}.ico" "${ICON}"
@@ -63,20 +84,7 @@ Section "Install"
SectionEnd
Section "Uninstall"
; What stage.sh lays out, and nothing else.
RMDir /r "$INSTDIR\libreoffice"
RMDir /r "$INSTDIR\tessdata"
RMDir /r "$INSTDIR\git"
RMDir /r "$INSTDIR\content"
RMDir /r "$INSTDIR\locales"
RMDir /r "$INSTDIR\licenses"
Delete "$INSTDIR\*.exe"
Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\*.pak"
Delete "$INSTDIR\*.bin"
Delete "$INSTDIR\*.dat"
Delete "$INSTDIR\*.json"
Delete "$INSTDIR\${APP_SLUG}.ico"
!insertmacro ElyRemoveFiles
RMDir "$INSTDIR"
Delete "$SMPROGRAMS\${APP_NAME}.lnk"
DeleteRegKey HKCU "Software\Ely Office\${APP_NAME}"