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

Merge pull request #119 from SafeMarket/gruntfile_env_fix 

env fix
This commit is contained in:
Iuri Matias 2015-11-23 08:25:37 -05:00
parent 58b2cb84ae a15b134c40
commit 9a33a392a5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/embark
View File

@ -67,7 +67,7 @@ program.command('build [env]').description('build dapp').action(function(env_) {
if (embarkConfig.type === "grunt") { if (embarkConfig.type === "grunt") {
run("grunt clean"); run("grunt clean");
run("grunt deploy_contracts:" + env); run("grunt deploy_contracts:" + env);
run('grunt build:' + env); run('grunt build --env=' + env);
} }
else if (embarkConfig.type === "meteor") { else if (embarkConfig.type === "meteor") {
deploy(env, embarkConfig); deploy(env, embarkConfig);
@ -82,8 +82,8 @@ program.command('ipfs [env]').description('build dapp and make it available in i
if (embarkConfig.type === "grunt") { if (embarkConfig.type === "grunt") {
run("grunt clean") run("grunt clean")
run("grunt deploy_contracts:" + env) run("grunt deploy_contracts:" + env)
run('grunt build:' + env) run('grunt build --env=' + env)
run('grunt ipfs:' + env) run('grunt ipfs --env=' + env)
} }
else if (embarkConfig.type === "meteor") { else if (embarkConfig.type === "meteor") {
deploy(env, embarkConfig); deploy(env, embarkConfig);
@ -100,7 +100,7 @@ program.command('run [env]').description('run dapp').action(function(env_) {
var embarkConfig = readYaml.sync("./embark.yml"); var embarkConfig = readYaml.sync("./embark.yml");
if (embarkConfig.type === "grunt") { if (embarkConfig.type === "grunt") {
run('grunt deploy:' + env); run('grunt deploy --env=' + env);
} }
else { else {
console.log("command not available in meteor or manual mode yet"); console.log("command not available in meteor or manual mode yet");

6
boilerplate/Gruntfile.coffee
View File

@ -110,5 +110,7 @@ module.exports = (grunt) ->
# Loads all plugins that match "grunt-", in this case all of our current plugins # Loads all plugins that match "grunt-", in this case all of our current plugins
require('matchdep').filterAll('grunt-*').forEach(grunt.loadNpmTasks) require('matchdep').filterAll('grunt-*').forEach(grunt.loadNpmTasks)
grunt.registerTask "deploy", ["coffee", "deploy_contracts", "concat", "copy", "server", "watch"] env = grunt.option('env')
grunt.registerTask "build", ["clean", "deploy_contracts", "coffee", "concat", "uglify", "copy"]
grunt.registerTask "deploy", ["coffee", "deploy_contracts:"+env, "concat", "copy", "server", "watch"]
grunt.registerTask "build", ["clean", "deploy_contracts:"+env, "coffee", "concat", "uglify", "copy"]