embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'linting_fixes' of github.com:embark-framework/embark into linting_fixes 

Please enter a commit message to explain why this merge is necessary,
This commit is contained in:
Iuri Matias 2018-10-29 21:37:03 +01:00
parent 5362b804c4 31deca4729
commit 0cca992fca
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/cmd.js
View File

@ -26,7 +26,6 @@ if (!process.env.PKG_PATH) {
} }
process.env.DEFAULT_DIAGRAM_PATH = utils.joinPath(process.env.DAPP_PATH, 'diagram.svg'); process.env.DEFAULT_DIAGRAM_PATH = utils.joinPath(process.env.DAPP_PATH, 'diagram.svg');
process.env.DEFAULT_CMD_HISTORY_PATH = utils.joinPath(process.env.DAPP_PATH, '.embark', 'cmd_history');
process.env.DEFAULT_CMD_HISTORY_SIZE = 20; process.env.DEFAULT_CMD_HISTORY_SIZE = 20;
class Cmd { class Cmd {

3
cmd/dashboard/command_history.js
View File

@ -2,8 +2,7 @@ let fs = require('../../lib/core/fs');
class CommandHistory { class CommandHistory {
constructor(options = {}) { constructor(options = {}) {
this.cmdHistoryFile = options.cmdHistoryFile this.cmdHistoryFile = options.cmdHistoryFile || fs.dappPath('.embark', 'cmd_history');
|| process.env.DEFAULT_CMD_HISTORY_PATH;
this.history = []; this.history = [];
this.pointer = -1; this.pointer = -1;
this.loadHistory(); this.loadHistory();

2
lib/modules/console/index.js
View File

@ -16,7 +16,7 @@ class Console {
this.ipc = options.ipc; this.ipc = options.ipc;
this.config = options.config; this.config = options.config;
this.history = []; this.history = [];
this.cmdHistoryFile = options.cmdHistoryFile || process.env.DEFAULT_CMD_HISTORY_PATH; this.cmdHistoryFile = options.cmdHistoryFile || fs.dappPath('.embark', 'cmd_history');
this.loadHistory(); this.loadHistory();
if (this.ipc.isServer()) { if (this.ipc.isServer()) {