archive-gh-me/shelljs
1
0
Fork 0
mirror of https://github.com/shelljs/shelljs.git synced 2026-01-25 16:07:37 +00:00
Code Issues Projects Releases Wiki Activity

fix(exec): temp files are now cleaned up

Browse Source
This commit is contained in:
Nate Fischer 2016-02-11 15:20:32 -08:00
parent 90569dcdac
commit fed412ff1b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/exec.js
View File

@ -94,7 +94,16 @@ function execSync(cmd, opts) {
}
// Welcome to the future
child.execSync(execCommand, opts);
try {
child.execSync(execCommand, opts);
} catch (e) {
// Clean up immediately if we have an exception
try { common.unlinkSync(scriptFile); } catch(e) {}
try { common.unlinkSync(stdoutFile); } catch(e) {}
try { common.unlinkSync(stderrFile); } catch(e) {}
try { common.unlinkSync(codeFile); } catch(e) {}
throw e;
}
} else {
cmd += ' > '+stdoutFile+' 2> '+stderrFile; // works on both win/unix
@ -117,6 +126,7 @@ function execSync(cmd, opts) {
while (!fs.existsSync(codeFile)) { updateStream(stdoutFile); fs.writeFileSync(sleepFile, 'a'); }
while (!fs.existsSync(stdoutFile)) { updateStream(stdoutFile); fs.writeFileSync(sleepFile, 'a'); }
while (!fs.existsSync(stderrFile)) { updateStream(stderrFile); fs.writeFileSync(sleepFile, 'a'); }
try { common.unlinkSync(sleepFile); } catch(e) {}
}
// At this point codeFile exists, but it's not necessarily flushed yet.
@ -134,11 +144,9 @@ function execSync(cmd, opts) {
try { common.unlinkSync(stdoutFile); } catch(e) {}
try { common.unlinkSync(stderrFile); } catch(e) {}
try { common.unlinkSync(codeFile); } catch(e) {}
try { common.unlinkSync(sleepFile); } catch(e) {}
// some shell return codes are defined as errors, per http://tldp.org/LDP/abs/html/exitcodes.html
if (code === 1 || code === 2 || code >= 126) {
common.error('', true); // unix/shell doesn't really give an error message after non-zero exit codes
if (code !== 0) {
common.error('', true);
}
// True if successful, false if not
var obj = {

2
test/exec.js
View File

@ -64,7 +64,7 @@ assert.ok(result.stderr === '1234\n' || result.stderr === '1234\nundefined\n');
// check exit code
var result = shell.exec('node -e \"process.exit(12);\"');
assert.equal(shell.error(), null);
assert.ok(shell.error());
assert.equal(result.code, 12);
// interaction with cd