Merge pull request #29 from upfrontIO/fix-multiline-command

Fix execution of template string with shell.exec
livingdocsIO · May 30, 2018 · 9a4dd02 · 9a4dd02
2 parents 43a7735 + f9effe1
commit 9a4dd02
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/modules/exec.js b/lib/modules/exec.js
@@ -1,11 +1,11 @@
 module.exports = function (dep) {
   const { shell, console, colors } = dep
   return function (command, dryRun = false) {
-    console.log(colors.yellow(`  ${command}`))
+    const cmd = command.replace(/(?:\\[rn]|[\r\n]+)+/g, '')
+    console.log(colors.yellow(`  ${cmd}`))
     if (!dryRun) {
-      const result = shell.exec(command)
-      result.stdout = result.stdout.replace(/\n$/, '')
-      result.stdout = result.stdout.replace(/\n$/, '')
+      const result = shell.exec(cmd)
+      result.stdout = result.stdout.replace(/(?:\\[rn]|[\r\n]+)+/g, '')
       return result
     }
   }