@forge/cli

12.15.0-experimental-43cfec412.16.0-next.6
out/command-line/uninstall-command-helpers.js
~out/command-line/uninstall-command-helpers.jsModified
+8−7
Index: package/out/command-line/uninstall-command-helpers.js
===================================================================
--- package/out/command-line/uninstall-command-helpers.js
+++ package/out/command-line/uninstall-command-helpers.js
@@ -96,18 +96,19 @@
         ui.error(new shared_1.UninstallAppError(uninstallMessage));
     }
 };
 exports.performSingleUninstall = performSingleUninstall;
-const performMultipleUninstalls = async (appsToUninstallFirst, appsToUninstallSecond, { ui, commands: { uninstallAppCommand } }) => {
+const performMultipleUninstalls = async (appsToUninstallFirst, appsToUninstallSecond, { ui, commands: { uninstallAppCommand } }, completionMessage) => {
     const filteredInstallations = appsToUninstallFirst.filter(({ product }) => product !== 'identity');
     const hasMultipleNonIdentityApps = filteredInstallations.length > 1;
     const uninstalledApps = await ui.displayProgress(async () => {
-        const result1 = await uninstallAppCommand.batchExecute([], appsToUninstallFirst);
-        if (result1.some(({ successful }) => successful === false)) {
-            return result1;
+        const result = [];
+        result.push(...(await uninstallAppCommand.batchExecute([], appsToUninstallFirst)));
+        if (result.some(({ successful }) => successful === false)) {
+            return result;
         }
-        const result2 = await uninstallAppCommand.batchExecute([], appsToUninstallSecond);
-        return result1.concat(result2);
+        result.push(...(await uninstallAppCommand.batchExecute([], appsToUninstallSecond)));
+        return result;
     }, cli_shared_1.Text.uninstall.cmd.start, (result) => {
         const isSuccessful = !result.some(({ successful }) => successful === false);
         return {
             successful: isSuccessful,
@@ -130,9 +131,9 @@
     if (uninstalledApps.some(({ successful }) => successful === false)) {
         throw new errors_1.DeferredErrors(deferredErrors);
     }
     if (hasMultipleNonIdentityApps) {
-        ui.info(cli_shared_1.Text.uninstall.interactive.done);
+        ui.info(completionMessage || cli_shared_1.Text.uninstall.interactive.done);
     }
 };
 exports.performMultipleUninstalls = performMultipleUninstalls;
 //# sourceMappingURL=uninstall-command-helpers.js.map
\ No newline at end of file