Merge PR #931: Ignore error code 1638 in win installer for the vc_redist package

This commit is contained in:
jenkins 2022-12-07 14:42:21 +01:00
commit de3442b9d7

View File

@ -13,7 +13,8 @@ changeLicenseLabels = function()
Component.prototype.createOperations = function()
{
component.createOperations();
component.addOperation("Execute", "@TargetDir@/vc_redist.x64.exe", "/quiet", "/norestart");
// Ignoring return code 1638, which means a newer version of the redist is already installed
component.addOperation("Execute", "{0,1638}", "@TargetDir@/vc_redist.x64.exe", "/quiet", "/norestart");
if (systemInfo.productType === "windows") {
component.addOperation("CreateShortcut", "@TargetDir@/nymea-app.exe", "@StartMenuDir@/nymea app.lnk",
"workingDirectory=@TargetDir@", "iconPath=@TargetDir@/logo.ico",