From 2a239c9d8343b69b07d29e6f51e48a03d2490dea Mon Sep 17 00:00:00 2001 From: Jacob Tran Date: Tue, 19 Jun 2018 13:51:16 -0700 Subject: [PATCH 1/5] Removing newline from branch --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index db9a98f..ff66fe5 100644 --- a/index.js +++ b/index.js @@ -63,7 +63,7 @@ function getEnvIdFromBranch () { return _.trimEnd(_.truncate(branch, { length: 13, omission: '' - }), '-') + }), '-').replace(/(\r\n|\n|\r)/gm," ") } catch (e) { console.log('ERR: ', e) // Do nothing From fc4ed24062413252b8eb2620483fb73082965456 Mon Sep 17 00:00:00 2001 From: Jacob Tran Date: Tue, 19 Jun 2018 13:51:56 -0700 Subject: [PATCH 2/5] reflect change in testing --- test/_env.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/_env.js b/test/_env.js index 6f04ca5..887b7f0 100644 --- a/test/_env.js +++ b/test/_env.js @@ -9,5 +9,5 @@ module.exports = function (regex) { return env ? _.truncate(env, { length: 13, omission: '' - }) : undefined + }).replace(/(\r\n|\n|\r)/gm," ") : undefined } From 9dbe3b870a7e6504ed93135b38501ce1f5ce7842 Mon Sep 17 00:00:00 2001 From: Jacob Tran Date: Tue, 19 Jun 2018 13:52:49 -0700 Subject: [PATCH 3/5] replace with nothing --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index ff66fe5..03201ba 100644 --- a/index.js +++ b/index.js @@ -63,7 +63,7 @@ function getEnvIdFromBranch () { return _.trimEnd(_.truncate(branch, { length: 13, omission: '' - }), '-').replace(/(\r\n|\n|\r)/gm," ") + }), '-').replace(/(\r\n|\n|\r)/gm,'') } catch (e) { console.log('ERR: ', e) // Do nothing From 9b8092be69e6a950dd78b624b421a5baa4d24603 Mon Sep 17 00:00:00 2001 From: Jacob Tran Date: Tue, 19 Jun 2018 13:53:27 -0700 Subject: [PATCH 4/5] Update _env.js --- test/_env.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/_env.js b/test/_env.js index 887b7f0..3e69a69 100644 --- a/test/_env.js +++ b/test/_env.js @@ -9,5 +9,5 @@ module.exports = function (regex) { return env ? _.truncate(env, { length: 13, omission: '' - }).replace(/(\r\n|\n|\r)/gm," ") : undefined + }).replace(/(\r\n|\n|\r)/gm,'') : undefined } From 95508820880bab81daca82f32acf8d1de224cc79 Mon Sep 17 00:00:00 2001 From: Jacob Tran Date: Tue, 19 Jun 2018 13:55:52 -0700 Subject: [PATCH 5/5] add space after , --- index.js | 2 +- test/_env.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 03201ba..fbbf014 100644 --- a/index.js +++ b/index.js @@ -63,7 +63,7 @@ function getEnvIdFromBranch () { return _.trimEnd(_.truncate(branch, { length: 13, omission: '' - }), '-').replace(/(\r\n|\n|\r)/gm,'') + }), '-').replace(/(\r\n|\n|\r)/gm, '') } catch (e) { console.log('ERR: ', e) // Do nothing diff --git a/test/_env.js b/test/_env.js index 3e69a69..50e0f8b 100644 --- a/test/_env.js +++ b/test/_env.js @@ -9,5 +9,5 @@ module.exports = function (regex) { return env ? _.truncate(env, { length: 13, omission: '' - }).replace(/(\r\n|\n|\r)/gm,'') : undefined + }).replace(/(\r\n|\n|\r)/gm, '') : undefined }