[matroska] r1193 - trunk/MatroskaPack/Satsuki

Author: robux4
Date: 2005-05-23 22:51:34 +0400 (Mon, 23 May 2005)
New Revision: 1193

Modified:
   trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
   trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
   trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh
Log:
pack: change the order of uninstallation, it should be better now

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi	2005-05-23 12:50:11 UTC (rev 1192)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi	2005-05-23 18:51:34 UTC (rev 1193)
@@ -141,18 +141,18 @@
 functionend
 
 Section "-UninstallPrevious"
-; version 1.1.0+
+; version 1.0.3-
+;  Gabest's Splitter
+    ReadRegStr $R1 HKCR "CLSID\{0A68C3B5-9164-4A54-AFAF-995B2FF0E0D4}\InprocServer32" ""
+    IfFileExists "$R1" 0 nogabest
+    UnRegDll "$R1"
+  nogabest:
 	ReadRegStr $R1 HKCU "Software\Matroska Pack" ""
 	IfFileExists "$R1\uninstall.exe" desinstallpack suiteuninstall
+; version 1.1.0+
   desinstallpack:
 	ExecWait '"$R1\uninstall.exe" /S _?=$R1'
   suiteuninstall:
-; version 1.0.3-
-;  Gabest's Splitter
-    ReadRegStr $R1 HKCR "CLSID\{0A68C3B5-9164-4A54-AFAF-995B2FF0E0D4}\InprocServer32" ""
-    IfFileExists "$R1" 0 nogabest
-    ExecWait 'regsvr32 /u /s "$R1"'
-  nogabest:
     ReadRegStr $R1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" UninstallString
     IfFileExists "$R1" 0 suiteinstall
     ExecWait "$R1 /S"

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi	2005-05-23 12:50:11 UTC (rev 1192)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi	2005-05-23 18:51:34 UTC (rev 1193)
@@ -135,18 +135,18 @@
 functionend
 
 Section "-UninstallPrevious"
-; version 1.1.0+
+; version 1.0.3-
+;  Gabest's Splitter
+    ReadRegStr $R1 HKCR "CLSID\{0A68C3B5-9164-4A54-AFAF-995B2FF0E0D4}\InprocServer32" ""
+    IfFileExists "$R1" 0 nogabest
+    UnRegDll "$R1"
+  nogabest:
 	ReadRegStr $R1 HKCU "Software\Matroska Pack" ""
 	IfFileExists "$R1\uninstall.exe" desinstallpack suiteuninstall
+; version 1.1.0+
   desinstallpack:
 	ExecWait '"$R1\uninstall.exe" /S _?=$R1'
   suiteuninstall:
-; version 1.0.3-
-;  Gabest's Splitter
-    ReadRegStr $R1 HKCR "CLSID\{0A68C3B5-9164-4A54-AFAF-995B2FF0E0D4}\InprocServer32" ""
-    IfFileExists "$R1" 0 nogabest
-    ExecWait 'regsvr32 /u /s "$R1"'
-  nogabest:
     ReadRegStr $R1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" UninstallString
     IfFileExists "$R1" 0 suiteinstall
     ExecWait "$R1 /S"

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh	2005-05-23 12:50:11 UTC (rev 1192)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh	2005-05-23 18:51:34 UTC (rev 1193)
@@ -1,5 +1,5 @@
 !define VERSION_MAJOR "1.1.1"
-!define VERSION_MINOR "1191"      ; should correspond to the latest SVN version
+!define VERSION_MINOR "1193"      ; should correspond to the latest SVN version
 !define VERSION_RC    "1"
 !define VERSION_BETA  "2"