From 5a472326ad1d450ffe7500e8596b7ed62cbd2727 Mon Sep 17 00:00:00 2001
From: Philipp Kunz <kunz@lossless-digital.com>
Date: Wed, 14 Dec 2016 16:38:57 +0000
Subject: [PATCH 1/2] Update npmci.install.ts

---
 ts/npmci.install.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ts/npmci.install.ts b/ts/npmci.install.ts
index d7c8049..50943df 100644
--- a/ts/npmci.install.ts
+++ b/ts/npmci.install.ts
@@ -30,7 +30,6 @@ export let install = (versionArg) => {
             for (let npmTool of configArg.globalNpmTools) {
                 plugins.beautylog.info(`Checking for global "${npmTool}"`)
                 let whichOutput = bashNoError(`which ${npmTool}`)
-                console.log(whichOutput)
                 let toolAvailable: boolean = !(/not\sfound/.test(whichOutput))
                 if (toolAvailable) {
                     plugins.beautylog.log(`Tool ${npmTool} is available`)

From 4c3d28418631d7747c9d631ebe779ed242223067 Mon Sep 17 00:00:00 2001
From: Philipp Kunz <kunz@lossless-digital.com>
Date: Wed, 14 Dec 2016 16:45:48 +0000
Subject: [PATCH 2/2] Update npmci.bash.ts

---
 ts/npmci.bash.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ts/npmci.bash.ts b/ts/npmci.bash.ts
index fabbf61..36d964d 100644
--- a/ts/npmci.bash.ts
+++ b/ts/npmci.bash.ts
@@ -15,11 +15,18 @@ checkNvm()
 
 /**
  * bash() allows using bash with nvm in path
+ * @param commandArg - The command to execute
+ * @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
  */
 export let bash = (commandArg: string, retryArg: number = 2, bareArg: boolean = false): string => {
     let exitCode: number
     let stdOut: string
     let execResult
+    let failOnError: boolean = true;
+    if(retryArg === -1) {
+        failOnError = false
+        retryArg = 0
+    }
     if (!process.env.NPMTS_TEST) { // NPMTS_TEST is used during testing
         for (let i = 0; i <= retryArg; i++) {
             if (!bareArg) {
@@ -34,8 +41,10 @@ export let bash = (commandArg: string, retryArg: number = 2, bareArg: boolean =
 
             // determine how bash reacts to error and success
             if (exitCode !== 0 && i === retryArg) { // something went wrong and retries are exhausted
-                process.exit(1)
-            } else if (exitCode === 0 || retryArg === -1) { // everything went fine, or no error wanted
+                if (failOnError) {
+                    process.exit(1)
+                }
+            } else if (exitCode === 0) { // everything went fine, or no error wanted
                 i = retryArg + 1 // retry +1 breaks for loop, if everything works out ok retrials are not wanted
             } else {
                 plugins.beautylog.warn('Something went wrong! Exit Code: ' + exitCode.toString())