@forge/cli
12.22.0-experimental-04cc2b912.23.0-next.7-experimental-44b7a12
out/command-line/controller/install-controller.js~
out/command-line/controller/install-controller.jsModified+9−6
Index: package/out/command-line/controller/install-controller.js
===================================================================
--- package/out/command-line/controller/install-controller.js
+++ package/out/command-line/controller/install-controller.js
@@ -51,23 +51,23 @@
const isWorkspaceProduct = !!product && this.supportedProductsService.isWorkspaceProduct(product);
return this.ui.displayProgress(async () => {
if (isUpgrade && currentVersion) {
const isAlreadyUpdated = await this.installationService.upgradeInstallation(site, product, environment, appId, currentVersion, majorVersionId, isCodeUpgrade, targetVersion, isLatest);
- return isAlreadyUpdated;
+ return { operation: 'upgrade', alreadyUpdated: isAlreadyUpdated };
}
else {
- await this.installAppSiteCommand.execute({
+ const installResult = await this.installAppSiteCommand.execute({
environmentKey: environment,
site,
product,
licenseOverride: license,
overrides,
majorVersionId,
environmentType
});
- return false;
+ return { operation: 'install', alreadyUpdated: false, installResult };
}
- }, text.cmd.start(environment, environmentType, (0, cli_shared_1.productDisplayName)(product)), (alreadyUpdated) => {
+ }, text.cmd.start(environment, environmentType, (0, cli_shared_1.productDisplayName)(product)), ({ alreadyUpdated }) => {
if (alreadyUpdated) {
return isWorkspaceProduct
? cli_shared_1.Text.upgrade.alreadyUpdated.spinnerWorkspace
: cli_shared_1.Text.upgrade.alreadyUpdated.spinnerSite;
@@ -280,15 +280,18 @@
return;
}
for (const product of products) {
try {
- const isAlreadyUpdated = await this.installOrUpgrade(isUpgrade, environment, environmentType, site, product, id, text, isCodeUpgrade, validLicense, overrides, environmentPermissions?.versionId, environmentPermissions?.version, currentVersion, environmentPermissions?.isLatest);
- if (isAlreadyUpdated) {
+ const result = await this.installOrUpgrade(isUpgrade, environment, environmentType, site, product, id, text, isCodeUpgrade, validLicense, overrides, environmentPermissions?.versionId, environmentPermissions?.version, currentVersion, environmentPermissions?.isLatest);
+ if (result.operation === 'upgrade' && result.alreadyUpdated) {
this.ui.info(cli_shared_1.Text.upgrade.alreadyUpdated.banner(environment, (0, cli_shared_1.productDisplayName)(product), site.host));
}
else {
this.ui.clearSpinner();
this.ui.emptyLine();
+ if (result.operation === 'install') {
+ this.installView.displayInstallationWarnings(result.installResult.warnings);
+ }
successfulProducts.push(product);
}
}
catch (error) {