From 6e5f672b74ddee2d65a11748dba48f54f823992a Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 1 Dec 2003 22:47:23 +0000
Subject: [PATCH] update/uninstall CVS data

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3241 212acab6-be3b-0410-9dea-997c60f758d6
---
 Examples/cvsdata.nsi  | 17 +++++++++--------
 Examples/makensis.nsi |  5 +++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Examples/cvsdata.nsi b/Examples/cvsdata.nsi
index 84fa9ec6..289d9e88 100644
--- a/Examples/cvsdata.nsi
+++ b/Examples/cvsdata.nsi
@@ -8,11 +8,13 @@
 
 Name "CVS Data"
 OutFile "..\Bin\InstallCVSData.exe"
-SetCompressor bzip2
+SetCompressor lzma
 
 SilentInstall silent
 
 Var NSISPATH
+Var UNINSTALL
+Var TEMP1
 
 ;--------------------------------
 ;Macro
@@ -35,13 +37,12 @@ Function .onInit
 
   StrCpy $NSISPATH "$EXEDIR\.."
   
-  IfFileExists "$NSISPATH\CVS\Root" "" +6
-    Call GetParameters
-    Pop $R0
-    StrCmp $R0 "nooverwrite" +2
-      MessageBox MB_YESNO|MB_ICONEXCLAMATION \
-      "Your NSIS folder already contains CVS data. Do you want to overwrite your current data?" IDYES +2
-      Quit
+  Call GetParameters
+  Pop $TEMP1
+  
+  StrCmp $TEMP1 "nooverwrite" 0 +3
+    IfFileExists "$NSISPATH\CVS\Root" 0 +2
+      Abort
 
 FunctionEnd
 
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index c884df34..9283dcc4 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -363,6 +363,10 @@ Section "NSIS Update" SecToolsUpdate
   SetOutPath $INSTDIR\Bin
   File ..\Bin\NSISUpdate.exe
   File ..\Bin\InstallCVSData.exe
+  
+  IfFileExists "$INSTDIR\CVS\Root" 0 +2
+    Exec '"$INSTDIR\Bin\InstallCVSData.exe"'
+    
 SectionEnd
 
 Section "Zip2Exe" SecToolsZ2E
@@ -1448,6 +1452,7 @@ Section Uninstall
   Delete $INSTDIR\nsisconf.nsi
   Delete $INSTDIR\nsisconf.nsh
   Delete $INSTDIR\NSIS.chm
+  RMDIR /r $INSTDIR\CVS 
   RMDir /r $INSTDIR\Contrib
   RMDir /r $INSTDIR\Menu
   RMDir /r $INSTDIR\Source