Remove exit handler on exit

index.js

@@ -216,11 +216,15 @@ module.exports = (cmd, args, opts) => {
 	let timeoutId = null;
 	let timedOut = false;
 
-	const cleanupTimeout = () => {
+	const cleanup = () => {
 		if (timeoutId) {
 			clearTimeout(timeoutId);
 			timeoutId = null;
 		}
+
+		if (removeExitHandler) {
+			removeExitHandler();
+		}
 	};
 
 	if (parsed.opts.timeout > 0) {
@@ -233,18 +237,18 @@ module.exports = (cmd, args, opts) => {
 
 	const processDone = new Promise(resolve => {
 		spawned.on('exit', (code, signal) => {
-			cleanupTimeout();
+			cleanup();
 			resolve({code, signal});
 		});
 
 		spawned.on('error', err => {
-			cleanupTimeout();
+			cleanup();
 			resolve({error: err});
 		});
 
 		if (spawned.stdin) {
 			spawned.stdin.on('error', err => {
-				cleanupTimeout();
+				cleanup();
 				resolve({error: err});
 			});
 		}
@@ -269,10 +273,6 @@ module.exports = (cmd, args, opts) => {
 		result.stdout = arr[1];
 		result.stderr = arr[2];
 
-		if (removeExitHandler) {
-			removeExitHandler();
-		}
-
 		if (result.error || result.code !== 0 || result.signal !== null) {
 			const err = makeError(result, {
 				joinedCmd,

test.js

@@ -507,3 +507,20 @@ test('detach child process', async t => {
 
 	t.is(fs.readFileSync(file, 'utf8'), 'foo\n');
 });
+
+// See #128
+test('removes exit handler on exit', async t => {
+	// FIXME: This relies on `signal-exit` internals
+	const ee = process.__signal_exit_emitter__;
+
+	const child = m('noop');
+	const listener = ee.listeners('exit').pop();
+
+	await new Promise((resolve, reject) => {
+		child.on('error', reject);
+		child.on('exit', resolve);
+	});
+
+	const included = ee.listeners('exit').indexOf(listener) !== -1;
+	t.false(included);
+});