mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-05-01 14:45:42 +08:00
[installer] Change "swift is still running" to simply wait until swift has quit
This commit is contained in:
@@ -27,15 +27,16 @@
|
|||||||
<actionDefinition>
|
<actionDefinition>
|
||||||
<name>checkForRunningSwift</name>
|
<name>checkForRunningSwift</name>
|
||||||
<actionList>
|
<actionList>
|
||||||
<validatedActionGroup>
|
<showProgressDialog>
|
||||||
<explanation>Check that no swift applications running</explanation>
|
<title>Waiting for swift to be closed</title>
|
||||||
<text>It seems that some swift application is still in use,
|
|
||||||
please close it and click Retry.</text>
|
|
||||||
<severity>warning</severity>
|
|
||||||
<actionList>
|
<actionList>
|
||||||
<throwError>
|
<while>
|
||||||
<text>Swift is still running. User aborted installation.</text>
|
<progressText>It seems that some swift application is still in use.
|
||||||
<ruleList>
|
It must be closed before the installation can proceed</progressText>
|
||||||
|
<actionList>
|
||||||
|
<wait><ms>50</ms></wait>
|
||||||
|
</actionList>
|
||||||
|
<conditionRuleList>
|
||||||
<ruleGroup>
|
<ruleGroup>
|
||||||
<ruleEvaluationLogic>or</ruleEvaluationLogic>
|
<ruleEvaluationLogic>or</ruleEvaluationLogic>
|
||||||
<ruleList>
|
<ruleList>
|
||||||
@@ -60,10 +61,10 @@ please close it and click Retry.</text>
|
|||||||
<platformTest>
|
<platformTest>
|
||||||
<type>windows</type>
|
<type>windows</type>
|
||||||
</platformTest>
|
</platformTest>
|
||||||
</ruleList>
|
</conditionRuleList>
|
||||||
</throwError>
|
</while>
|
||||||
</actionList>
|
</actionList>
|
||||||
</validatedActionGroup>
|
</showProgressDialog>
|
||||||
</actionList>
|
</actionList>
|
||||||
</actionDefinition>
|
</actionDefinition>
|
||||||
<actionDefinition>
|
<actionDefinition>
|
||||||
|
|||||||
Reference in New Issue
Block a user