Skip to content

Commit 159e706

Browse files
committed
Merge branch 'develop' of https://github.com/febiosoftware/FEBioStudio into develop
2 parents fae1fcd + 5d7e997 commit 159e706

1 file changed

Lines changed: 23 additions & 0 deletions

File tree

ci/installBuilder.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<enableTimestamp>1</enableTimestamp>
1414
<vendor>University of Utah</vendor>
1515
<windows64bitMode>1</windows64bitMode>
16+
<rebootRequired>0</rebootRequired>
1617
<windowsSoftwareRegistryPrefix>${product_fullname}</windowsSoftwareRegistryPrefix>
1718
<osxSigningPkcs12File>/Users/GitRunner/osx_app_signing.p12</osxSigningPkcs12File>
1819
<osxSigningPkcs12Password>${env(MACOS_PKCS12_PSWD)}</osxSigningPkcs12Password>
@@ -247,6 +248,17 @@
247248
<fileTest condition="exists" path="${oldLocation}"/>
248249
</ruleList>
249250
</throwError>
251+
252+
<!-- Check if FEBio Studio is currently running -->
253+
<throwError>
254+
<text>FEBio Studio is currently running. Please close it before proceeding with the installation.</text>
255+
<ruleList>
256+
<processTest>
257+
<logic>is_running</logic>
258+
<name>FEBioStudio.exe</name>
259+
</processTest>
260+
</ruleList>
261+
</throwError>
250262
</actionList>
251263
<ruleList>
252264
<platformTest type="windows"/>
@@ -417,6 +429,17 @@ MimeType=application/x-febiostudioproject;application/x-febiostudiomodel;applica
417429
<!-- Windows -->
418430
<actionGroup>
419431
<actionList>
432+
<!-- Check if FEBio Studio is currently running -->
433+
<throwError>
434+
<text>FEBio Studio is currently running. Please close it before proceeding with the uninstallation.</text>
435+
<ruleList>
436+
<processTest>
437+
<logic>is_running</logic>
438+
<name>FEBioStudio.exe</name>
439+
</processTest>
440+
</ruleList>
441+
</throwError>
442+
420443
<registryDelete>
421444
<key>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\App Paths\FEBioStudio.exe</key>
422445
<name></name>

0 commit comments

Comments
 (0)