moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve TODO: set cwd when launching doors; allow user to set in config

This commit is contained in:
Bryan Ashby 2018-06-25 19:25:07 -06:00
parent 2fa9d6a3c2
commit fa100c2da1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/abracadabra.js
View File

@ -149,6 +149,7 @@ exports.getModule = class AbracadabraModule extends MenuModule {
const exeInfo = {
cmd : this.config.cmd,
cwd : this.config.cwd, // null/undefined=path of |cwd|
args : this.config.args,
io : this.config.io || 'stdio',
encoding : this.config.encoding || this.client.term.outputEncoding,

6
core/door.js
View File

@ -7,6 +7,7 @@ const { Errors } = require('./enig_error.js');
const pty = require('node-pty');
const decode = require('iconv-lite').decode;
const createServer = require('net').createServer;
const paths = require('path');
module.exports = class Door {
constructor(client) {
@ -55,12 +56,15 @@ module.exports = class Door {
return cb(Errors.UnexpectedState('Socket server is not running'));
}
const cwd = exeInfo.cwd || paths.dirname(exeInfo.cmd);
const formatObj = {
dropFile : exeInfo.dropFile,
dropFilePath : exeInfo.dropFilePath,
node : exeInfo.node.toString(),
srvPort : this.sockServer ? this.sockServer.address().port.toString() : '-1',
userId : this.client.user.userId.toString(),
cwd : cwd,
};
const args = exeInfo.args.map( arg => stringFormat(arg, formatObj) );
@ -68,7 +72,7 @@ module.exports = class Door {
const door = pty.spawn(exeInfo.cmd, args, {
cols : this.client.term.termWidth,
rows : this.client.term.termHeight,
// :TODO: cwd
cwd : cwd,
env : exeInfo.env,
encoding : null, // we want to handle all encoding ourself
});