From 2b7e6f80fa4abb7b614bd77c4675642946c19a9a Mon Sep 17 00:00:00 2001 From: DimitarTachev Date: Thu, 17 Oct 2019 09:02:30 +0300 Subject: [PATCH] fix: replace the custom CLI termination logic with a simple CTRL+C signal --- src/common/terminateProcess.sh | 12 ------------ src/common/utilities.ts | 5 ++--- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100755 src/common/terminateProcess.sh diff --git a/src/common/terminateProcess.sh b/src/common/terminateProcess.sh deleted file mode 100755 index 9b06884..0000000 --- a/src/common/terminateProcess.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -terminateTree() { - for cpid in $(/usr/bin/pgrep -P $1); do - terminateTree $cpid - done - kill -9 $1 > /dev/null 2>&1 -} - -for pid in $*; do - terminateTree $pid -done diff --git a/src/common/utilities.ts b/src/common/utilities.ts index a6d3255..38d5b52 100644 --- a/src/common/utilities.ts +++ b/src/common/utilities.ts @@ -13,9 +13,8 @@ export function killProcess(childProcess: ChildProcess, logger?: ILogger): void break; default: - const cmd = path.join(__dirname, 'terminateProcess.sh'); - - execSync(`${cmd} ${childProcess.pid.toString()}`); + // ctrl + c + execSync(`kill -2 ${childProcess.pid.toString()}`); break; } } catch (error) {