[matroska] r1189 - trunk/MatroskaPack/Satsuki

Author: robux4
Date: 2005-05-23 13:14:40 +0400 (Mon, 23 May 2005)
New Revision: 1189

Modified:
   trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
   trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh
Log:
pack: clean unistallation of the previous versions of the pack

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi	2005-05-22 07:31:28 UTC (rev 1188)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi	2005-05-23 09:14:40 UTC (rev 1189)
@@ -141,10 +141,16 @@
 functionend
 
 Section "-UninstallPrevious"
+; version 1.1.0+
 	ReadRegStr $R1 HKCU "Software\Matroska Pack" ""
-	IfFileExists "$R1\uninstall.exe" desinstallpack suiteinstall
+	IfFileExists "$R1\uninstall.exe" desinstallpack suiteuninstall
   desinstallpack:
 	ExecWait '"$R1\uninstall.exe" /S _?=$R1'
+  suiteuninstall:
+; version 1.0.3-
+    ReadRegStr $R1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" UninstallString
+    IfFileExists "$R1" 0 suiteinstall
+    ExecWait "$R1 /S"
   suiteinstall:
 	WriteRegStr HKCU "Software\Matroska Pack" "" $INSTDIR
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
@@ -386,6 +392,11 @@
 sectionend
 
 section /o "Matroska Shell Extension" SecMSE
+; uninstall previous version
+    ReadRegStr $R1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MatroskaProp" UninstallString
+    IfFileExists "$R1" 0 msesuite
+    ExecWait "$R1 /S"
+  msesuite:
 	SetOutPath "$INSTDIR\provo"
     AddSize 1860
     file "elements\MatroskaProp.exe"

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh	2005-05-22 07:31:28 UTC (rev 1188)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh	2005-05-23 09:14:40 UTC (rev 1189)
@@ -1,7 +1,7 @@
 !define VERSION_MAJOR "1.1.1"
-!define VERSION_MINOR "1174"      ; should correspond to the latest SVN version
+!define VERSION_MINOR "1187"      ; should correspond to the latest SVN version
 !define VERSION_RC    "1"
-!define VERSION_BETA  "1"
+!define VERSION_BETA  "2"
 
 ;!define RELEASE_CAN "yep"
 !define BETA        "yep"