From ee75273cbd22cbfaf89c16b125bc3ae0cbecf60e Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Mon, 23 Mar 2009 14:57:58 +0100 Subject: [PATCH] Remove locale directories during upgrade and uninstallation. The old "german" locale directory should be removed during upgrades. The "de" and "ja" locale directories should be removed during uninstallation. Fixes for bug 361. --- installer/mkvtoolnix-unicode.nsi | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/installer/mkvtoolnix-unicode.nsi b/installer/mkvtoolnix-unicode.nsi index 0e71c30e5..6930fdac0 100644 --- a/installer/mkvtoolnix-unicode.nsi +++ b/installer/mkvtoolnix-unicode.nsi @@ -145,6 +145,10 @@ Section "Program files" SEC01 Delete "$INSTDIR\libcharset.dll" Delete "$INSTDIR\libiconv.dll" + Delete "$INSTDIR\locale\german\LC_MESSAGES\mkvtoolnix.mo" + RMDir "$INSTDIR\locale\german\LC_MESSAGES" + RMDir "$INSTDIR\locale\german" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\AppMainExe.exe" Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\Command line reference\base64tool CLI reference.lnk" SetShellVarContext current @@ -302,10 +306,14 @@ Section Uninstall Delete "$INSTDIR\examples\matroskasegmentinfo.dtd" Delete "$INSTDIR\examples\matroskatags.dtd" - Delete "$INSTDIR\locale\german\LC_MESSAGES\mkvtoolnix.mo" + Delete "$INSTDIR\locale\de\LC_MESSAGES\mkvtoolnix.mo" + RMDir "$INSTDIR\locale\de\LC_MESSAGES" + RMDir "$INSTDIR\locale\de" + + Delete "$INSTDIR\locale\ja\LC_MESSAGES\mkvtoolnix.mo" + RMDir "$INSTDIR\locale\ja\LC_MESSAGES" + RMDir "$INSTDIR\locale\ja" - RMDir "$INSTDIR\locale\german\LC_MESSAGES" - RMDir "$INSTDIR\locale\german" RMDir "$INSTDIR\locale" RMDir "$INSTDIR\data" RMDir "$INSTDIR\doc\images"