Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)

127273 jphuynh: MNT-16290: Prevent an existing folder from being deleted when aborting the installation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

src/main/resources/bitrock/project.xml

@@ -481,6 +481,10 @@
     </showInfo>
     </finalPageActionList>
     
+    <readyToInstallActionList>
+        <setInstallerVariable name="validInstallDir" value="1" />
+    </readyToInstallActionList>
+    
     <installationAbortedActionList>
         <actionGroup>
             <actionList>
@@ -496,6 +500,7 @@
                 <deleteFile path="${installdir}" />
             </actionList>
             <ruleList>
+                <compareText text="${validInstallDir}" logic="equals" value="1" />
                 <compareText text="${installation_aborted_by_user}" logic="equals" value="1" />
             </ruleList>
         </actionGroup>