Merge branch '0.0.9-alpha' of ssh://numinibsd/git/base/enigma-bbs into user-interruptions
This commit is contained in:
@@ -222,7 +222,9 @@ module.exports = class ArchiveUtil {
|
||||
try {
|
||||
proc = pty.spawn(archiver.compress.cmd, args, this.getPtyOpts());
|
||||
} catch(e) {
|
||||
return cb(e);
|
||||
return cb(Errors.ExternalProcess(
|
||||
`Error spawning archiver process "${archiver.compress.cmd}" with args "${args.join(' ')}": ${e.message}`)
|
||||
);
|
||||
}
|
||||
|
||||
return this.spawnHandler(proc, 'Compression', cb);
|
||||
@@ -272,7 +274,9 @@ module.exports = class ArchiveUtil {
|
||||
try {
|
||||
proc = pty.spawn(archiver[action].cmd, args, this.getPtyOpts(extractPath));
|
||||
} catch(e) {
|
||||
return cb(e);
|
||||
return cb(Errors.ExternalProcess(
|
||||
`Error spawning archiver process "${archiver[action].cmd}" with args "${args.join(' ')}": ${e.message}`)
|
||||
);
|
||||
}
|
||||
|
||||
return this.spawnHandler(proc, (haveFileList ? 'Extraction' : 'Decompression'), cb);
|
||||
@@ -295,7 +299,9 @@ module.exports = class ArchiveUtil {
|
||||
try {
|
||||
proc = pty.spawn(archiver.list.cmd, args, this.getPtyOpts());
|
||||
} catch(e) {
|
||||
return cb(e);
|
||||
return cb(Errors.ExternalProcess(
|
||||
`Error spawning archiver process "${archiver.list.cmd}" with args "${args.join(' ')}": ${e.message}`)
|
||||
);
|
||||
}
|
||||
|
||||
let output = '';
|
||||
|
||||
10
core/bbs.js
10
core/bbs.js
@@ -45,6 +45,10 @@ function printHelpAndExit() {
|
||||
process.exit();
|
||||
}
|
||||
|
||||
function printVersionAndExit() {
|
||||
console.info(require('../package.json').version);
|
||||
}
|
||||
|
||||
function main() {
|
||||
async.waterfall(
|
||||
[
|
||||
@@ -52,7 +56,11 @@ function main() {
|
||||
const argv = require('minimist')(process.argv.slice(2));
|
||||
|
||||
if(argv.help) {
|
||||
printHelpAndExit();
|
||||
return printHelpAndExit();
|
||||
}
|
||||
|
||||
if(argv.version) {
|
||||
return printVersionAndExit();
|
||||
}
|
||||
|
||||
const configOverridePath = argv.config;
|
||||
|
||||
Reference in New Issue
Block a user