flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 06:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[installer] Change "swift is still running" to an abort/retry dialog

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-10-31 20:02:49 +00:00
parent c1a0c7293d
commit 0dfebcf623
1 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
installer/installbuilder/project.xml
View File

@@ -24,20 +24,14 @@
</include>
</componentList>
<preInstallationActionList>
<actionGroup>
<validatedActionGroup>
<explanation>Check that no swift applications running</explanation>
<text>It seems that some swift application is still in use,
please close it and click Retry.</text>
<severity>warning</severity>
<actionList>
<showWarning>
<ruleEvaluationLogic>or</ruleEvaluationLogic>
<text>It seems that some swift application is still in use, please close
it and relaunch the installer.</text>
</showWarning>
<exit>
<exitCode>1</exitCode>
</exit>
</actionList>
<ruleList>
<ruleGroup>
<throwError>
<text>Swift is still running. User aborted installation.</text>
<ruleList>
<ruleGroup>
<ruleEvaluationLogic>or</ruleEvaluationLogic>
@@ -64,9 +58,9 @@ it and relaunch the installer.</text>
<type>windows</type>
</platformTest>
</ruleList>
</ruleGroup>
</ruleList>
</actionGroup>
</throwError>
</actionList>
</validatedActionGroup>
<!-- TODO Linux/MacOS: Save and load last install dir -->
<setInstallerVariable>
<name>installBaseDir</name>
@@ -216,20 +210,14 @@ it and relaunch the installer.</text>
</runProgram>
</postInstallationActionList>
<preUninstallationActionList>
<actionGroup>
<validatedActionGroup>
<explanation>Check that no swift applications running</explanation>
<text>It seems that some swift application is still in use,
please close it and click Retry.</text>
<severity>warning</severity>
<actionList>
<showWarning>
<ruleEvaluationLogic>or</ruleEvaluationLogic>
<text>It seems that some swift application is still in use, please close
it and relaunch the uninstaller.</text>
</showWarning>
<exit>
<exitCode>1</exitCode>
</exit>
</actionList>
<ruleList>
<ruleGroup>
<throwError>
<text>Swift is still running. User aborted installation.</text>
<ruleList>
<ruleGroup>
<ruleEvaluationLogic>or</ruleEvaluationLogic>
@@ -256,9 +244,9 @@ it and relaunch the uninstaller.</text>
<type>windows</type>
</platformTest>
</ruleList>
</ruleGroup>
</ruleList>
</actionGroup>
</throwError>
</actionList>
</validatedActionGroup>
<runProgram>
<program>launchctl</program>
<programArguments>remove org.freedesktop.dbus-session.plist</programArguments>