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
This commit is contained in:
Jean-Pierre Huynh
2016-05-19 15:40:04 +00:00
parent 768f0f4bb3
commit 9469c60054

View File

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