Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
This commit is contained in:
commit
2d82f6e480
10
README.md
10
README.md
|
@ -25,6 +25,16 @@ For specs: pyethereum, ethertdd.py
|
||||||
$ npm install -g embark-framework grunt-cli
|
$ 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).
|
See [Complete Installation Instructions](https://github.com/iurimatias/embark-framework/wiki/Installation).
|
||||||
|
|
||||||
Usage - Demo
|
Usage - Demo
|
||||||
|
|
|
@ -126,4 +126,9 @@ Blockchain.prototype.execGeth = function(args) {
|
||||||
exec(cmd);
|
exec(cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Blockchain.prototype.getStartChainCommand = function(use_tmp) {
|
||||||
|
var address = this.get_address();
|
||||||
|
return this.run_command(address, use_tmp);
|
||||||
|
}
|
||||||
|
|
||||||
module.exports = Blockchain
|
module.exports = Blockchain
|
||||||
|
|
|
@ -35,6 +35,11 @@ Embark = {
|
||||||
chain.startChain(use_tmp);
|
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) {
|
deployContracts: function(env, contractFiles, destFile, chainFile) {
|
||||||
this.contractsConfig.init(contractFiles, env);
|
this.contractsConfig.init(contractFiles, env);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue