archive-gh-me/pm2
1
0
Fork 0
mirror of https://github.com/Unitech/pm2.git synced 2025-12-08 20:35:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of github.com:Unitech/pm2 into development

Browse Source
This commit is contained in:
Unitech 2017-02-03 15:14:52 +01:00
commit 0a6adb72d6
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/API/Modules/Modularizer.js
View File

@ -185,9 +185,8 @@ function uninstallModule(CLI, module_name, cb) {
}
function installLangModule(module_name, cb) {
var node_module_path = path.resolve(path.join(__dirname, '../../../'));
var install_instance = spawn(cst.IS_WINDOWS ? 'npm.cmd' : 'npm', [
'install', module_name, '--prefix', node_module_path, '--loglevel=error'
'install', module_name, '--prefix', cst.PM2_INSTALL_PATH, '--loglevel=error'
],{
stdio : 'inherit',
env: process.env,

6
lib/Common.js
View File

@ -369,15 +369,15 @@ Common.sink.resolveInterpreter = function(app) {
* Specific installed JS transpilers
*/
if (app.exec_interpreter == 'ts-node') {
app.exec_interpreter = path.join(__dirname, '../node_modules/.bin/ts-node');
app.exec_interpreter = path.join(cst.PM2_INSTALL_PATH, 'node_modules/.bin/ts-node');
}
if (app.exec_interpreter == 'lsc') {
app.exec_interpreter = path.join(__dirname, '../node_modules/.bin/lsc');
app.exec_interpreter = path.join(cst.PM2_INSTALL_PATH, 'node_modules/.bin/lsc');
}
if (app.exec_interpreter == 'coffee') {
app.exec_interpreter = path.join(__dirname, '../node_modules/.bin/coffee');
app.exec_interpreter = path.join(cst.PM2_INSTALL_PATH, 'node_modules/.bin/coffee');
}
if (app.exec_interpreter != 'none' && shelljs.which(app.exec_interpreter) == null) {

4
paths.js
View File

@ -35,6 +35,8 @@ module.exports = function(PM2_HOME) {
PM2_HOME : PM2_HOME,
PM2_ROOT_PATH : PM2_HOME,
PM2_INSTALL_PATH : p.resolve('.'),
PM2_CONF_FILE : p.join(PM2_HOME, 'conf.js'),
PM2_MODULE_CONF_FILE : p.join(PM2_HOME, 'module_conf.json'),
@ -61,6 +63,6 @@ module.exports = function(PM2_HOME) {
pm2_file_stucture.DAEMON_PUB_PORT = '\\\\.\\pipe\\pub.sock';
pm2_file_stucture.INTERACTOR_RPC_PORT = '\\\\.\\pipe\\interactor.sock';
}
return pm2_file_stucture;
};