- SetOutPath creates the empty folders for us. Thus 'File /nonfatal' trick is not...

- Simplify deletion patterns in the Uninstall section

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1035068 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index e900914..7410f16 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -162,12 +162,10 @@ Section "Core" SecTomcatCore
   File NOTICE
   SetOutPath $INSTDIR\lib
   File /r lib\*.*
+  ; Note: just calling 'SetOutPath' will create the empty folders for us
   SetOutPath $INSTDIR\logs
-  File /nonfatal /r logs\*.*
   SetOutPath $INSTDIR\work
-  File /nonfatal /r work\*.*
   SetOutPath $INSTDIR\temp
-  File /nonfatal /r temp\*.*
   SetOutPath $INSTDIR\bin
   File bin\bootstrap.jar
   File bin\tomcat-juli.jar
@@ -917,8 +915,10 @@ Section Uninstall
     MessageBox MB_YESNO|MB_ICONQUESTION \
       "Remove all files in your Tomcat @VERSION_MAJOR_MINOR@ directory? (If you have anything  \
  you created that you want to keep, click No)" IDNO Removed
-    RMDir /r "$INSTDIR\webapps\ROOT" ; this would be skipped if the user hits no
-    RMDir "$INSTDIR\webapps"
+    ; these would be skipped if the user hits no
+    RMDir /r "$INSTDIR\webapps"
+    RMDir /r "$INSTDIR\logs"
+    RMDir /r "$INSTDIR\conf"
     Delete "$INSTDIR\*.*"
     RMDir /r "$INSTDIR"
     Sleep 500