[installer] Remember prior 32bit and 64bit install paths separately

This commit is contained in:
Mat Sutcliffe
2020-08-31 00:12:10 +01:00
parent e9b0d57b2a
commit 0b9103c1f7

View File

@@ -115,7 +115,7 @@ It must be closed before the installation can proceed</progressText>
<actionList> <actionList>
<readFile> <readFile>
<name>installBaseDir</name> <name>installBaseDir</name>
<path>${windows_folder_local_appdata}/org.swift-project/lastinstallpath.txt</path> <path>${windows_folder_local_appdata}/org.swift-project/lastinstallpath-${architecture}bit.txt</path>
</readFile> </readFile>
<setInstallerVariableFromRegEx> <setInstallerVariableFromRegEx>
<name>installBaseDir</name> <name>installBaseDir</name>
@@ -130,7 +130,7 @@ It must be closed before the installation can proceed</progressText>
</platformTest> </platformTest>
<fileTest> <fileTest>
<condition>readable</condition> <condition>readable</condition>
<path>${windows_folder_local_appdata}/org.swift-project/lastinstallpath.txt</path> <path>${windows_folder_local_appdata}/org.swift-project/lastinstallpath-${architecture}bit.txt</path>
</fileTest> </fileTest>
</ruleList> </ruleList>
</actionGroup> </actionGroup>
@@ -214,7 +214,7 @@ It must be closed before the installation can proceed</progressText>
</ruleList> </ruleList>
</createDirectory> </createDirectory>
<writeFile> <writeFile>
<path>${windows_folder_local_appdata}/org.swift-project/lastinstallpath.txt</path> <path>${windows_folder_local_appdata}/org.swift-project/lastinstallpath-${architecture}bit.txt</path>
<text>${installdir}</text> <text>${installdir}</text>
<ruleList> <ruleList>
<platformTest> <platformTest>