mirror of
https://github.com/finos/SymphonyElectron.git
synced 2024-11-21 16:38:41 -06:00
fix: SDA-2068: show welcome screen per installation (#1020)
* SDA-2068: show welcome screen per installation - macOS * SDA-2068: show welcome screen per installation - windows Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com> * SDA-2068: support welcome screen on install for Windows
This commit is contained in:
Vishwas Shashidhar
GitHub
parent
e258f01db4
commit
310186f2dd
1
config/InstallVariant.info
Normal file
1
config/InstallVariant.info
Normal file
@ -0,0 +1 @@
|
||||
014EDEDF-E632-4E53-AAEC-B4FC8AF1E72D
|
||||
@ -4,8 +4,10 @@
|
||||
settingsFilePath='/tmp/sym_settings.txt'
|
||||
permissionsFilePath='/tmp/sym_permissions.txt'
|
||||
installPath="$2"
|
||||
configPath="/Symphony.app/Contents/config/Symphony.config"
|
||||
newPath=${installPath}${configPath}
|
||||
configPath="/Symphony.app/Contents/config"
|
||||
configFilePath="${installPath}${configPath}/Symphony.config"
|
||||
installVariantPath="${installPath}${configPath}/InstallVariant.info"
|
||||
newPath=${configFilePath}
|
||||
|
||||
## Get Symphony Settings from the temp file ##
|
||||
pod_url=$(sed -n '1p' ${settingsFilePath});
|
||||
@ -62,3 +64,5 @@ sed -i "" -E "s#\"openExternal\" ?: ?([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])#\"o
|
||||
## Remove the temp settings & permissions file created ##
|
||||
rm -f ${settingsFilePath}
|
||||
rm -f ${permissionsFilePath}
|
||||
|
||||
uuidgen > ${installVariantPath}
|
||||
@ -30,6 +30,7 @@
|
||||
<ROW Property="FULL_SCREEN" Value="true"/>
|
||||
<ROW Property="FULL_SCREEN_CB" Value="true"/>
|
||||
<ROW Property="FileInUseProcess" Value="Symphony.exe" Type="4"/>
|
||||
<ROW Property="INSTALL_VARIANT" Value="014EDEDF-E632-4E53-AAEC-B4FC8AF1E72D"/>
|
||||
<ROW Property="LOCATION" Value="true"/>
|
||||
<ROW Property="MEDIA" Value="true"/>
|
||||
<ROW Property="MIDI_SYSEX" Value="true"/>
|
||||
@ -164,6 +165,7 @@
|
||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
|
||||
<ROW File="CODE_OF_CONDUCT.md_2" Component_="build.cmd" FileName="CODE_O~1.MD|CODE_OF_CONDUCT.md" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\CODE_OF_CONDUCT.md" SelfReg="false" NextFile="COPYING"/>
|
||||
<ROW File="COPYING" Component_="build.cmd" FileName="COPYING" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\COPYING" SelfReg="false" NextFile="esdoc.json"/>
|
||||
<ROW File="InstallVariant.info" Component_="Symphony.config" FileName="INSTAL~1.INF|InstallVariant.info" Attributes="0" SourcePath="..\..\dist\win-unpacked\config\InstallVariant.info" SelfReg="false"/>
|
||||
<ROW File="Jobber.exe" Component_="Jobber.exe" FileName="Jobber.exe" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\vendor\jobber\Jobber.exe" SelfReg="false" NextFile="libEGL.dll_1" DigSign="true"/>
|
||||
<ROW File="LICENSE.electron.txt" Component_="blink_image_resources_200_percent.pak" FileName="LICENS~1.TXT|LICENSE.electron.txt" Attributes="0" SourcePath="..\..\dist\win-unpacked\LICENSE.electron.txt" SelfReg="false" NextFile="LICENSES.chromium.html"/>
|
||||
<ROW File="LICENSES.chromium.html" Component_="blink_image_resources_200_percent.pak" FileName="LICENS~1.HTM|LICENSES.chromium.html" Attributes="0" SourcePath="..\..\dist\win-unpacked\LICENSES.chromium.html" SelfReg="false" NextFile="Symphony.exe"/>
|
||||
@ -176,7 +178,7 @@
|
||||
<ROW File="ar.pak" Component_="am.pak" FileName="ar.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\ar.pak" SelfReg="false" NextFile="bg.pak"/>
|
||||
<ROW File="bg.pak" Component_="am.pak" FileName="bg.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\bg.pak" SelfReg="false" NextFile="bn.pak"/>
|
||||
<ROW File="binding.node" Component_="binding.node" FileName="BINDIN~1.NOD|binding.node" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\ref-napi\build\Release\binding.node" SelfReg="false" NextFile="build.cmd"/>
|
||||
<ROW File="binding.node_1" Component_="binding.node_1" FileName="BINDIN~1.NOD|binding.node" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\swift-search\node_modules\ref-napi\build\Release\binding.node" SelfReg="false"/>
|
||||
<ROW File="binding.node_1" Component_="binding.node_1" FileName="BINDIN~1.NOD|binding.node" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\swift-search\node_modules\ref-napi\build\Release\binding.node" SelfReg="false" NextFile="InstallVariant.info"/>
|
||||
<ROW File="bn.pak" Component_="am.pak" FileName="bn.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\bn.pak" SelfReg="false" NextFile="ca.pak"/>
|
||||
<ROW File="build.cmd" Component_="build.cmd" FileName="build.cmd" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\build.cmd" SelfReg="false" NextFile="build.sh"/>
|
||||
<ROW File="build.sh" Component_="build.cmd" FileName="build.sh" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\build.sh" SelfReg="false" NextFile="CODE_OF_CONDUCT.md_2"/>
|
||||
@ -448,7 +450,7 @@
|
||||
<ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/>
|
||||
<ROW Dialog_="InstallTypeDlg" Control_="Next" Event="EndDialog" Argument="Return" Condition="AI_INSTALL AND ( AI_PROCESS_STATE="Stopped" )" Ordering="105"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Cancel" Event="SpawnDialog" Argument="CancelDlg" Condition="1" Ordering="100"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="13"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="16"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Browse" Event="[_BrowseProperty]" Argument="APPDIR" Condition="1" Ordering="100"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Browse" Event="SpawnDialog" Argument="BrowseDlg" Condition="1" Ordering="200"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Back" Event="SpawnDialog" Argument="InstallTypeDlg" Condition="AI_INSTALL" Ordering="1"/>
|
||||
@ -534,9 +536,9 @@
|
||||
<ROW Dialog_="CloseSymphonyDialog" Control_="Back" Event="DoAction" Argument="AI_DATA_SETTER_2" Condition="1" Ordering="1"/>
|
||||
<ROW Dialog_="InstallTypeDlg" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER_2" Condition="AI_INSTALL" Ordering="101"/>
|
||||
<ROW Dialog_="InstallTypeDlg" Control_="Next" Event="SpawnDialog" Argument="CloseSymphonyDialog" Condition="AI_INSTALL AND ( AI_PROCESS_STATE="Running" )" Ordering="103"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="SpawnDialog" Argument="OutOfRbDiskDlg" Condition="AI_INSTALL AND OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)" Ordering="14" Options="2"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="EnableRollback" Argument="False" Condition="AI_INSTALL AND OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"" Ordering="15" Options="2"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="SpawnDialog" Argument="OutOfDiskDlg" Condition="AI_INSTALL AND ( (OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F") )" Ordering="16" Options="2"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="SpawnDialog" Argument="OutOfRbDiskDlg" Condition="AI_INSTALL AND OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)" Ordering="17" Options="2"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="EnableRollback" Argument="False" Condition="AI_INSTALL AND OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"" Ordering="18" Options="2"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="SpawnDialog" Argument="OutOfDiskDlg" Condition="AI_INSTALL AND ( (OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F") )" Ordering="19" Options="2"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="InstallationDlgDialogInitializer" Event="[AI_ButtonText_Next_Orig]" Argument="[ButtonText_Next]" Condition="AI_INSTALL" Ordering="1" Options="2"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="InstallationDlgDialogInitializer" Event="[ButtonText_Next]" Argument="[[AI_CommitButton]]" Condition="AI_INSTALL" Ordering="2" Options="2"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="InstallationDlgDialogInitializer" Event="[AI_Text_Next_Orig]" Argument="[Text_Next]" Condition="AI_INSTALL" Ordering="3" Options="2"/>
|
||||
@ -544,6 +546,8 @@
|
||||
<ROW Dialog_="InstallationDlg" Control_="Back" Event="[ButtonText_Next]" Argument="[AI_ButtonText_Next_Orig]" Condition="AI_INSTALL" Ordering="2" Options="2"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Back" Event="[Text_Next]" Argument="[AI_Text_Next_Orig]" Condition="AI_INSTALL" Ordering="3" Options="2"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="DoAction" Argument="SetDefaults" Condition="AI_INSTALL" Ordering="12"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="DoAction" Argument="UpdateInstallVariant" Condition="AI_INSTALL" Ordering="15"/>
|
||||
<ROW Dialog_="InstallationDlg" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER" Condition="AI_INSTALL" Ordering="14"/>
|
||||
</COMPONENT>
|
||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
|
||||
<ROW Directory_="Symphony_Dir" Component_="Symphony" ManualDelete="false"/>
|
||||
@ -556,6 +560,7 @@
|
||||
<ROW Action="AI_AiRestoreDeferredImpersonate" Type="9217" Source="ResourceCleaner.dll" Target="OnAiRestoreDeferredImpersonate"/>
|
||||
<ROW Action="AI_AiRestoreRollback" Type="11521" Source="ResourceCleaner.dll" Target="OnAiRestoreRollback" WithoutSeq="true"/>
|
||||
<ROW Action="AI_AuthorSinglePackage" Type="1" Source="aicustact.dll" Target="AI_AuthorSinglePackage" WithoutSeq="true"/>
|
||||
<ROW Action="AI_DATA_SETTER" Type="51" Source="CustomActionData" Target="AEkAcwA2ADQAQgBpAHQAAgABAFAAYQByAGEAbQBzAAIAAQBTAGMAcgBpAHAAdAACACMAIABCAGwAbwBjAGsAIABmAG8AcgAgAGQAZQBjAGwAYQByAGkAbgBnACAAdABoAGUAIABzAGMAcgBpAHAAdAAgAHAAYQByAGEAbQBlAHQAZQByAHMALgANAAoAUABhAHIAYQBtACgAKQANAAoADQAKACMAIABZAG8AdQByACAAYwBvAGQAZQAgAGcAbwBlAHMAIABoAGUAcgBlAC4ADQAKAGYAdQBuAGMAdABpAG8AbgAgAHUAdQBpAGQAIABbAFwAewBdACAAWwBcAFsAXQBnAHUAaQBkAFsAXABdAF0AOgA6AE4AZQB3AEcAdQBpAGQAKAApAC4AVABvAFMAdAByAGkAbgBnACgAKQAgAFsAXAB9AF0ADQAKACQAdQB1AGkAZABfAHYAYQBsAHUAZQAgAD0AIAB1AHUAaQBkAA0ACgBBAEkAXwBTAGUAdABNAHMAaQBQAHIAbwBwAGUAcgB0AHkAIABJAE4AUwBUAEEATABMAF8AVgBBAFIASQBBAE4AVAAgACQAdQB1AGkAZABfAHYAYQBsAHUAZQ=="/>
|
||||
<ROW Action="AI_DATA_SETTER_1" Type="51" Source="CustomActionData" Target="AEkAcwA2ADQAQgBpAHQAAgABAFAAYQByAGEAbQBzAAIAAQBTAGMAcgBpAHAAdAACACMAIABCAGwAbwBjAGsAIABmAG8AcgAgAGQAZQBjAGwAYQByAGkAbgBnACAAdABoAGUAIABzAGMAcgBpAHAAdAAgAHAAYQByAGEAbQBlAHQAZQByAHMALgANAAoAUABhAHIAYQBtACgAKQANAAoADQAKACMAIABZAG8AdQByACAAYwBvAGQAZQAgAGcAbwBlAHMAIABoAGUAcgBlAC4ADQAKAFIAZQBtAG8AdgBlAC0ASQB0AGUAbQBQAHIAbwBwAGUAcgB0AHkAIAAtAFAAYQB0AGgAIAAiAEgASwBDAFUAOgBTAG8AZgB0AHcAYQByAGUAXABNAGkAYwByAG8AcwBvAGYAdABcAFcAaQBuAGQAbwB3AHMAXABDAHUAcgByAGUAbgB0AFYAZQByAHMAaQBvAG4AXABSAHUAbgAiACAALQBOAGEAbQBlACAAIgBTAHkAbQBwAGgAbwBuAHkAIgAgAC0ARQByAHIAbwByAEEAYwB0AGkAbwBuACAAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQANAAoAUgBlAG0AbwB2AGUALQBJAHQAZQBtAFAAcgBvAHAAZQByAHQAeQAgAC0AUABhAHQAaAAgACIASABLAEMAVQA6AFMAbwBmAHQAdwBhAHIAZQBcAE0AaQBjAHIAbwBzAG8AZgB0AFwAVwBpAG4AZABvAHcAcwBcAEMAdQByAHIAZQBuAHQAVgBlAHIAcwBpAG8AbgBcAFIAdQBuACIAIAAtAE4AYQBtAGUAIAAiAGMAbwBtAC4AcwB5AG0AcABoAG8AbgB5AC4AZQBsAGUAYwB0AHIAbwBuAC0AZABlAHMAawB0AG8AcAAiACAALQBFAHIAcgBvAHIAQQBjAHQAaQBvAG4AIABTAGkAbABlAG4AdABsAHkAQwBvAG4AdABpAG4AdQBlAA0ACgBSAGUAbQBvAHYAZQAtAEkAdABlAG0AUAByAG8AcABlAHIAdAB5ACAALQBQAGEAdABoACAAIgBIAEsAQwBVADoAUwBvAGYAdAB3AGEAcgBlAFwATQBpAGMAcgBvAHMAbwBmAHQAXABXAGkAbgBkAG8AdwBzAFwAQwB1AHIAcgBlAG4AdABWAGUAcgBzAGkAbwBuAFwAUgB1AG4AIgAgAC0ATgBhAG0AZQAgACIAZQBsAGUAYwB0AHIAbwBuAC4AYQBwAHAALgBTAHkAbQBwAGgAbwBuAHkAIgAgAC0ARQByAHIAbwByAEEAYwB0AGkAbwBuACAAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQANAAoAUgBlAG0AbwB2AGUALQBJAHQAZQBtACAAIgBIAEsAQwBVADoAUwBvAGYAdAB3AGEAcgBlAFwAQwBsAGEAcwBzAGUAcwBcAHMAeQBtAHAAaABvAG4AeQAiACAALQBSAGUAYwB1AHIAcwBlACAALQBFAHIAcgBvAHIAQQBjAHQAaQBvAG4AIABTAGkAbABlAG4AdABsAHkAQwBvAG4AdABpAG4AdQBlAA0ACgANAAoAUgBlAG0AbwB2AGUALQBJAHQAZQBtACAAIgBIAEsATABNADoAUwBPAEYAVABXAEEAUgBFAFwAQwBsAGEAcwBzAGUAcwBcAHMAeQBtAHAAaABvAG4AeQAiACAALQBSAGUAYwB1AHIAcwBlACAALQBFAHIAcgBvAHIAQQBjAHQAaQBvAG4AIABTAGkAbABlAG4AdABsAHkAQwBvAG4AdABpAG4AdQBlAA0ACgANAAoATgBlAHcALQBQAFMARAByAGkAdgBlACAALQBOAGEAbQBlACAASABLAEMAUgAgAC0AUABTAFAAcgBvAHYAaQBkAGUAcgAgAFIAZQBnAGkAcwB0AHIAeQAgAC0AUgBvAG8AdAAgAEgASwBFAFkAXwBDAEwAQQBTAFMARQBTAF8AUgBPAE8AVAAgAC0ARQByAHIAbwByAEEAYwB0AGkAbwBuACAAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQANAAoAUgBlAG0AbwB2AGUALQBpAHQAZQBtACAAIgBIAEsAQwBSADoAXABzAHkAbQBwAGgAbwBuAHkAIgAgAC0AUgBlAGMAdQByAHMAZQAgAC0ARQByAHIAbwByAEEAYwB0AGkAbwBuACAAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQANAAoADQAKAE4AZQB3AC0AUABTAEQAcgBpAHYAZQAgAC0ATgBhAG0AZQAgAEgASwBVACAALQBQAFMAUAByAG8AdgBpAGQAZQByACAAUgBlAGcAaQBzAHQAcgB5ACAALQBSAG8AbwB0ACAASABLAEUAWQBfAFUAUwBFAFIAUwAgAC0ARQByAHIAbwByAEEAYwB0AGkAbwBuACAAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQANAAoAUgBlAG0AbwB2AGUALQBJAHQAZQBtAFAAcgBvAHAAZQByAHQAeQAgAC0AUABhAHQAaAAgACIASABLAFUAOgAuAEQARQBGAEEAVQBMAFQAXABTAG8AZgB0AHcAYQByAGUAXABNAGkAYwByAG8AcwBvAGYAdABcAFcAaQBuAGQAbwB3AHMAXABDAHUAcgByAGUAbgB0AFYAZQByAHMAaQBvAG4AXABSAHUAbgAiACAALQBOAGEAbQBlACAAIgBTAHkAbQBwAGgAbwBuAHkAIgAgAC0ARQByAHIAbwByAEEAYwB0AGkAbwBuACAAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQ=="/>
|
||||
<ROW Action="AI_DATA_SETTER_2" Type="51" Source="CustomActionData" Target="Symphony.exe"/>
|
||||
<ROW Action="AI_DATA_SETTER_4" Type="51" Source="CustomActionData" Target="Symphony.exe"/>
|
||||
@ -583,6 +588,7 @@
|
||||
<ROW Action="SetDefaults" Type="37" Target="Script Text" TargetUnformatted="if (!Session.Property("POD_URL")) { 	Session.Property("POD_URL") = "https://my.symphony.com"; } else { 	Session.Property("POD_URL") = Session.Property("POD_URL").replace(/^\s\s*/, '').replace(/\s\s*$/, ''); } var autoLaunchPath = Session.Property("AUTO_LAUNCH_PATH"); if (autoLaunchPath) { 	Session.Property("AUTO_LAUNCH_PATH") = autoLaunchPath.replace(/\\/g, "/"); } if (!Session.Property("ALWAYS_ON_TOP")) { 	Session.Property("ALWAYS_ON_TOP") = "DISABLED"; } if (!Session.Property("MINIMIZE_ON_CLOSE")) { 	Session.Property("MINIMIZE_ON_CLOSE") = "ENABLED"; } if (!Session.Property("AUTO_START")) { 	Session.Property("AUTO_START") = "ENABLED"; } if (!Session.Property("BRING_TO_FRONT")) { 	Session.Property("BRING_TO_FRONT") = "DISABLED"; } if (!Session.Property("CUSTOM_TITLE_BAR")) { 	Session.Property("CUSTOM_TITLE_BAR") = "ENABLED"; } if (!Session.Property("DEV_TOOLS_ENABLED")) { 	Session.Property("DEV_TOOLS_ENABLED") = "true"; } if (!Session.Property("MEDIA")) { 	Session.Property("MEDIA") = "true"; } if (!Session.Property("LOCATION")) { 	Session.Property("LOCATION") = "true"; } if (!Session.Property("NOTIFICATIONS")) { 	Session.Property("NOTIFICATIONS") = "true"; } if (!Session.Property("MIDI_SYSEX")) { 	Session.Property("MIDI_SYSEX") = "true"; } if (!Session.Property("POINTER_LOCK")) { 	Session.Property("POINTER_LOCK") = "true"; } if (!Session.Property("FULL_SCREEN")) { 	Session.Property("FULL_SCREEN") = "true"; } if (!Session.Property("OPEN_EXTERNAL")) { 	Session.Property("OPEN_EXTERNAL") = "true"; } " WithoutSeq="true"/>
|
||||
<ROW Action="StopProcess" Type="65" Source="aicustact.dll" Target="StopProcess" WithoutSeq="true" Options="1" AdditionalSeq="AI_DATA_SETTER_4"/>
|
||||
<ROW Action="UninstallPreviousVersions" Type="65" Source="aicustact.dll" Target="UninstallPreviousVersions" Options="1"/>
|
||||
<ROW Action="UpdateInstallVariant" Type="1" Source="PowerShellScriptLauncher.dll" Target="RunPowerShellScript" WithoutSeq="true" Options="1" AdditionalSeq="AI_DATA_SETTER"/>
|
||||
</COMPONENT>
|
||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiDialogComponent">
|
||||
<ROW Dialog="CloseSymphonyDialog" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
|
||||
@ -691,8 +697,10 @@
|
||||
<ROW Name="CustomTitleBar" TxtUpdateSet="Symphony.config" FindPattern=""isCustomTitleBar"\s*:\s*"ENABLED"," ReplacePattern=""isCustomTitleBar" : "[CUSTOM_TITLE_BAR]"," Options="19" Order="12" FileEncoding="-1"/>
|
||||
<ROW Name="DevTools" TxtUpdateSet="Symphony.config" FindPattern=""devToolsEnabled"\s*:\s*true," ReplacePattern=""devToolsEnabled" : [DEV_TOOLS_ENABLED]," Options="19" Order="13" FileEncoding="-1"/>
|
||||
<ROW Name="AutoLaunchPath" TxtUpdateSet="Symphony.config" FindPattern=""autoLaunchPath"\s*:\s*""" ReplacePattern=""autoLaunchPath" : "[AUTO_LAUNCH_PATH]"" Options="19" Order="14" FileEncoding="-1"/>
|
||||
<ROW Name="SetUUID" TxtUpdateSet="InstallVariant.info" FindPattern="014EDEDF-E632-4E53-AAEC-B4FC8AF1E72D" ReplacePattern="[INSTALL_VARIANT]" Options="0" Order="0" FileEncoding="-1"/>
|
||||
</COMPONENT>
|
||||
<COMPONENT cid="caphyon.advinst.msicomp.TxtUpdateSetComponent">
|
||||
<ROW Key="InstallVariant.info" Component="am.pak" FileName="InstallVariant.info" Directory="config_Dir" Options="17"/>
|
||||
<ROW Key="Symphony.config" Component="am.pak" FileName="Symphony.config" Directory="config_Dir" Options="17"/>
|
||||
</COMPONENT>
|
||||
</DOCUMENT>
|
||||
|
||||
71
package-lock.json
generated
71
package-lock.json
generated
@ -5553,22 +5553,14 @@
|
||||
}
|
||||
},
|
||||
"electron": {
|
||||
"version": "9.0.0",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/electron/-/electron-9.0.0.tgz",
|
||||
"integrity": "sha1-M1zUJqilQq2NTJbAxAqGaKtVJ7g=",
|
||||
"version": "9.0.2",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/electron/-/electron-9.0.2.tgz",
|
||||
"integrity": "sha1-NhkkzoMzlvGkWsIZX0QrkutPj10=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@electron/get": "^1.0.1",
|
||||
"@types/node": "^12.0.12",
|
||||
"extract-zip": "^1.0.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@types/node": {
|
||||
"version": "12.12.39",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/@types/node/-/node-12.12.39.tgz",
|
||||
"integrity": "sha1-Uy0lweY52J3W86odezli4+f6lD0=",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"electron-builder": {
|
||||
@ -8107,19 +8099,19 @@
|
||||
}
|
||||
},
|
||||
"global-agent": {
|
||||
"version": "2.1.8",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/global-agent/-/global-agent-2.1.8.tgz",
|
||||
"integrity": "sha1-mdFTZissBMvBGZ/7wIGjqmVqxQ8=",
|
||||
"version": "2.1.12",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/global-agent/-/global-agent-2.1.12.tgz",
|
||||
"integrity": "sha1-5K44Ercxqegcv4Jfk3fvRQqOQZU=",
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"boolean": "^3.0.0",
|
||||
"core-js": "^3.6.4",
|
||||
"boolean": "^3.0.1",
|
||||
"core-js": "^3.6.5",
|
||||
"es6-error": "^4.1.1",
|
||||
"matcher": "^2.1.0",
|
||||
"roarr": "^2.15.2",
|
||||
"semver": "^7.1.2",
|
||||
"serialize-error": "^5.0.0"
|
||||
"matcher": "^3.0.0",
|
||||
"roarr": "^2.15.3",
|
||||
"semver": "^7.3.2",
|
||||
"serialize-error": "^7.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"core-js": {
|
||||
@ -8129,6 +8121,23 @@
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"escape-string-regexp": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
|
||||
"integrity": "sha1-FLqDpdNz49MR5a/KKc9b+tllvzQ=",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"matcher": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/matcher/-/matcher-3.0.0.tgz",
|
||||
"integrity": "sha1-vZBg9MW3CqgEHMxvgDaHYJlPMMo=",
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"escape-string-regexp": "^4.0.0"
|
||||
}
|
||||
},
|
||||
"semver": {
|
||||
"version": "7.3.2",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/semver/-/semver-7.3.2.tgz",
|
||||
@ -8137,19 +8146,19 @@
|
||||
"optional": true
|
||||
},
|
||||
"serialize-error": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/serialize-error/-/serialize-error-5.0.0.tgz",
|
||||
"integrity": "sha1-p+u82wOl1xpu2EYf/g/Boa/tYqw=",
|
||||
"version": "7.0.1",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/serialize-error/-/serialize-error-7.0.1.tgz",
|
||||
"integrity": "sha1-8TYLBEf2H/tIPsQVfHN/q313jhg=",
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"type-fest": "^0.8.0"
|
||||
"type-fest": "^0.13.1"
|
||||
}
|
||||
},
|
||||
"type-fest": {
|
||||
"version": "0.8.1",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/type-fest/-/type-fest-0.8.1.tgz",
|
||||
"integrity": "sha1-CeJJ696FHTseSNJ8EFREZn8XuD0=",
|
||||
"version": "0.13.1",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/type-fest/-/type-fest-0.13.1.tgz",
|
||||
"integrity": "sha1-AXLLW86AsL1ULqNI21DH4hg02TQ=",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
}
|
||||
@ -14915,16 +14924,16 @@
|
||||
}
|
||||
},
|
||||
"screen-share-indicator-frame": {
|
||||
"version": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#c48f25a170fbf18361d109e58d391d105ca7efc5",
|
||||
"from": "screen-share-indicator-frame@git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#c48f25a170fbf18361d109e58d391d105ca7efc5",
|
||||
"version": "1.4.9",
|
||||
"resolved": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#11d7b82ae1b68ed88d2e9c5c84986aaab280ff00",
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"run-script-os": "1.0.7"
|
||||
}
|
||||
},
|
||||
"screen-snippet": {
|
||||
"version": "git+https://github.com/symphonyoss/ScreenSnippet2.git#da09ae15a9ca2978606548bc36e8eaa224128f45",
|
||||
"from": "screen-snippet@git+https://github.com/symphonyoss/ScreenSnippet2.git#da09ae15a9ca2978606548bc36e8eaa224128f45",
|
||||
"version": "1.0.9",
|
||||
"resolved": "git+https://github.com/symphonyoss/ScreenSnippet2.git#31f9fcbbd4750084307c830e2357eb22675eb77c",
|
||||
"optional": true
|
||||
},
|
||||
"semver": {
|
||||
|
||||
@ -55,6 +55,7 @@
|
||||
"extraFiles": [
|
||||
"config/Symphony.config",
|
||||
"config/titleBarStyles.css",
|
||||
"config/InstallVariant.info",
|
||||
"dictionaries/**",
|
||||
"library/libsymphonysearch.dylib",
|
||||
"library/indexvalidator.exec",
|
||||
|
||||
@ -37,6 +37,7 @@ export interface IConfig {
|
||||
notificationSettings: INotificationSetting;
|
||||
mainWinPos?: ICustomRectangle;
|
||||
locale?: string;
|
||||
installVariant?: string;
|
||||
}
|
||||
|
||||
export interface IGlobalConfig {
|
||||
@ -113,7 +114,10 @@ class Config {
|
||||
public cloudConfig: ICloudConfig | {};
|
||||
public filteredCloudConfig: ICloudConfig | {};
|
||||
private isFirstTime: boolean = true;
|
||||
private installVariant: string | undefined;
|
||||
private readonly configFileName: string;
|
||||
private readonly installVariantFilename: string;
|
||||
private readonly installVariantPath: string;
|
||||
private readonly userConfigPath: string;
|
||||
private readonly appPath: string;
|
||||
private readonly globalConfigPath: string;
|
||||
@ -121,6 +125,7 @@ class Config {
|
||||
|
||||
constructor() {
|
||||
this.configFileName = 'Symphony.config';
|
||||
this.installVariantFilename = 'InstallVariant.info';
|
||||
this.userConfigPath = path.join(app.getPath('userData'), this.configFileName);
|
||||
this.cloudConfigPath = path.join(app.getPath('userData'), 'cloudConfig.config');
|
||||
this.appPath = isDevEnv ? app.getAppPath() : path.dirname(app.getPath('exe'));
|
||||
@ -128,8 +133,13 @@ class Config {
|
||||
? path.join(this.appPath, path.join('config', this.configFileName))
|
||||
: path.join(this.appPath, (isMac) ? '..' : '', 'config', this.configFileName);
|
||||
|
||||
this.installVariantPath = isDevEnv
|
||||
? path.join(this.appPath, path.join('config', this.installVariantFilename))
|
||||
: path.join(this.appPath, (isMac) ? '..' : '', 'config', this.installVariantFilename);
|
||||
|
||||
if (isLinux) {
|
||||
this.globalConfigPath = path.join(this.appPath, (isElectronQA) ? '..' : '', 'config', this.configFileName);
|
||||
this.installVariantPath = path.join(this.appPath, (isElectronQA) ? '..' : '', 'config', this.installVariantFilename);
|
||||
}
|
||||
|
||||
this.globalConfig = {};
|
||||
@ -138,6 +148,7 @@ class Config {
|
||||
this.filteredCloudConfig = {};
|
||||
this.readUserConfig();
|
||||
this.readGlobalConfig();
|
||||
this.readInstallVariant();
|
||||
this.readCloudConfig();
|
||||
|
||||
this.checkFirstTimeLaunch();
|
||||
@ -263,10 +274,11 @@ class Config {
|
||||
...filteredFields }: IConfig = this.userConfig as IConfig;
|
||||
// update to the new build number
|
||||
filteredFields.buildNumber = buildNumber;
|
||||
filteredFields.installVariant = this.installVariant;
|
||||
logger.info(`config-handler: setting first time launch for build`, buildNumber);
|
||||
return await this.updateUserConfig(filteredFields);
|
||||
}
|
||||
await this.updateUserConfig({ buildNumber });
|
||||
await this.updateUserConfig({ buildNumber, installVariant: this.installVariant });
|
||||
}
|
||||
|
||||
/**
|
||||
@ -332,6 +344,14 @@ class Config {
|
||||
logger.info(`config-handler: Global configuration: `, this.globalConfig);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads the install variant from a file
|
||||
*/
|
||||
private readInstallVariant() {
|
||||
this.installVariant = fs.readFileSync(this.installVariantPath, 'utf8');
|
||||
logger.info(`config-handler: Install variant: `, this.installVariant);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads and stores the cloud config file
|
||||
*
|
||||
@ -354,20 +374,20 @@ class Config {
|
||||
*/
|
||||
private async checkFirstTimeLaunch() {
|
||||
logger.info('config-handler: checking first time launch');
|
||||
const configBuildNumber = this.userConfig && (this.userConfig as IConfig).buildNumber || null;
|
||||
const installVariant = this.userConfig && (this.userConfig as IConfig).installVariant || null;
|
||||
|
||||
if (!configBuildNumber) {
|
||||
logger.info(`config-handler: there's no build number found, this is a first time launch`);
|
||||
if (!installVariant) {
|
||||
logger.info(`config-handler: there's no install variant found, this is a first time launch`);
|
||||
this.isFirstTime = true;
|
||||
return;
|
||||
}
|
||||
|
||||
if (configBuildNumber && typeof configBuildNumber === 'string' && configBuildNumber !== buildNumber) {
|
||||
logger.info(`config-handler: build number found is of an older build, this is a first time launch`);
|
||||
if (installVariant && typeof installVariant === 'string' && installVariant !== this.installVariant) {
|
||||
logger.info(`config-handler: install variant found is of a different instance, this is a first time launch`);
|
||||
this.isFirstTime = true;
|
||||
return;
|
||||
}
|
||||
logger.info(`config-handler: build number is the same as the previous build, not a first time launch`);
|
||||
logger.info(`config-handler: install variant is the same as the existing one, not a first time launch`);
|
||||
this.isFirstTime = false;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user