[sling-slingpackager] 02/02: SLING-9558 - Fixed broken --install option with upload command.

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingpackager.git

commit 1219ec03bff8b066f3799fc5279d2637d6e07086
Author: Henry Saginor <hsagi...@gmail.com>
AuthorDate: Fri Jun 26 16:51:43 2020 -0700

    SLING-9558 - Fixed broken --install option with upload command.
---
 utils/composumpackager.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/utils/composumpackager.js b/utils/composumpackager.js
index 67322d3..bec3062 100644
--- a/utils/composumpackager.js
+++ b/utils/composumpackager.js
@@ -60,7 +60,6 @@ const upload = (url, username, password, packagePath, 
install, maxRetry) => {
             logger.debug(JSON.stringify(json));
 
             if(install) {
-                logger.info('installing', json.path);
                 installPackage(url, username, password, json.path, maxRetry);
             }
         }
@@ -90,15 +89,7 @@ const deletePackage = (url, username, password, package, 
maxRetry) => {
 }
 
 const install = (url, username, password, package, maxRetry) => {
-    logger.log('Installing package', package, 'on', url);
-
-    let post = postJob({url, username, password, package, maxRetry}, 
'install', (error, result) => {
-        if(error) {
-            logger.error('Unable to uninstall package', package);
-            logger.error(error);
-            process.exit(1);
-        } 
-    });
+    installPackage(url, username, password, package, maxRetry);
 }
 
 const uninstall = (url, username, password, package, maxRetry) => {
@@ -145,6 +136,18 @@ const getName = () => {
     return 'Composum Package Manager';
 }
 
+function installPackage(url, username, password, package, maxRetry) {
+    logger.log('Installing package', package, 'on', url);
+
+    let post = postJob({url, username, password, package, maxRetry}, 
'install', (error, result) => {
+        if(error) {
+            logger.error('Unable to uninstall package', package);
+            logger.error(error);
+            process.exit(1);
+        } 
+    });
+}
+
 function downloadPackage(data) {
     if(data.filePath) {
         data.serviceURL = data.url + "/bin/cpm/package.download.zip" + 
data.package;