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

This commit is contained in:
Iuri Matias 2015-08-31 20:17:41 -04:00
commit 2d82f6e480
3 changed files with 20 additions and 0 deletions

View File

@ -25,6 +25,16 @@ For specs: pyethereum, ethertdd.py
$ npm install -g embark-framework grunt-cli
```
If you get EACCES (access denied) errors, don't use sudo, try this:
```Bash
$ mkdir ~/npm-global
$ npm config set prefix ~/npm-global
$ echo 'export PATH="$PATH:$HOME/npm-global/bin"' >>~/.bashrc
$ source ~/.bashrc
$ npm install -g embark-framework grunt-cli
```
See [Complete Installation Instructions](https://github.com/iurimatias/embark-framework/wiki/Installation).
Usage - Demo

View File

@ -126,4 +126,9 @@ Blockchain.prototype.execGeth = function(args) {
exec(cmd);
}
Blockchain.prototype.getStartChainCommand = function(use_tmp) {
var address = this.get_address();
return this.run_command(address, use_tmp);
}
module.exports = Blockchain

View File

@ -35,6 +35,11 @@ Embark = {
chain.startChain(use_tmp);
},
getStartBlockchainCommand: function(env, use_tmp) {
var chain = new Blockchain(this.blockchainConfig.config(env));
return chain.getStartChainCommand(use_tmp);
},
deployContracts: function(env, contractFiles, destFile, chainFile) {
this.contractsConfig.init(contractFiles, env);