From 911013592710bed36b9c638aeb5081ac1e94d0f8 Mon Sep 17 00:00:00 2001
From: Ivan Goncharov <ivan.goncharov.ua@gmail.com>
Date: Tue, 23 Mar 2021 19:31:01 +0200
Subject: [PATCH] internal: simplify 'exec' function (#2978)

---
 benchmark/benchmark.js               |  2 +-
 integrationTests/integration-test.js |  4 ++--
 resources/utils.js                   | 22 +---------------------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js
index 72796481dd..3bf13c2093 100644
--- a/benchmark/benchmark.js
+++ b/benchmark/benchmark.js
@@ -35,7 +35,7 @@ function exec(command, options = {}) {
     stdio: ['inherit', 'pipe', 'inherit'],
     ...options,
   });
-  return result && result.trimEnd();
+  return result?.trimEnd();
 }
 
 // Build a benchmark-friendly environment for the given revision
diff --git a/integrationTests/integration-test.js b/integrationTests/integration-test.js
index 2f2c90e8fe..9c6ca461be 100644
--- a/integrationTests/integration-test.js
+++ b/integrationTests/integration-test.js
@@ -8,11 +8,11 @@ const childProcess = require('child_process');
 const { describe, it } = require('mocha');
 
 function exec(command, options = {}) {
-  const result = childProcess.execSync(command, {
+  const output = childProcess.execSync(command, {
     encoding: 'utf-8',
     ...options,
   });
-  return result != null ? result.trimEnd() : result;
+  return output && output.trimEnd();
 }
 
 describe('Integration Tests', () => {
diff --git a/resources/utils.js b/resources/utils.js
index 6ab659dc3b..253212c2d6 100644
--- a/resources/utils.js
+++ b/resources/utils.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const fs = require('fs');
-const util = require('util');
 const path = require('path');
 const childProcess = require('child_process');
 
@@ -11,25 +10,7 @@ function exec(command, options) {
     encoding: 'utf-8',
     ...options,
   });
-  return removeTrailingNewLine(output);
-}
-
-const childProcessExec = util.promisify(childProcess.exec);
-async function execAsync(command, options) {
-  const output = await childProcessExec(command, {
-    maxBuffer: 10 * 1024 * 1024, // 10MB
-    encoding: 'utf-8',
-    ...options,
-  });
-  return removeTrailingNewLine(output.stdout);
-}
-
-function removeTrailingNewLine(str) {
-  if (str == null) {
-    return str;
-  }
-
-  return str.split('\n').slice(0, -1).join('\n');
+  return output && output.trimEnd();
 }
 
 function readdirRecursive(dirPath, opts = {}) {
@@ -101,7 +82,6 @@ function showDirStats(dirPath) {
 
 module.exports = {
   exec,
-  execAsync,
   readdirRecursive,
   showDirStats,
 };