From 128fad27cfc1f8b7043da4f41daf493c9b4747c9 Mon Sep 17 00:00:00 2001 From: Alexander Bezzubov Date: Fri, 26 Jun 2015 11:42:35 +0900 Subject: [PATCH 1/4] Fixing grunt build --- grunt | 7 ++++++- package.json | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) mode change 100644 => 100755 grunt mode change 100755 => 100644 package.json diff --git a/grunt b/grunt old mode 100644 new mode 100755 index 759cae7..f0dea57 --- a/grunt +++ b/grunt @@ -14,5 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -"node/node" "./node_modules/.bin/grunt" "$@" +node="node/node" + +if hash "node" 2>/dev/null ; then + node="node" +fi +"$node" "./node_modules/.bin/grunt" "$@" diff --git a/package.json b/package.json old mode 100755 new mode 100644 index 0df9d2a..7c2d932 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "devDependencies": { "grunt": "^0.4.5", "grunt-autoprefixer": "^3.0.0", + "grunt-cli": "^0.1.13", "grunt-concurrent": "^1.0.0", "grunt-contrib-clean": "^0.6.0", "grunt-contrib-concat": "^0.5.0", @@ -37,4 +38,4 @@ "scripts": { "test": "grunt test" } -} \ No newline at end of file +} From 7b2e5ce4f6234a1d2790462d1e4f445f70cda3e0 Mon Sep 17 00:00:00 2001 From: Alexander Bezzubov Date: Fri, 26 Jun 2015 12:08:11 +0900 Subject: [PATCH 2/4] Adding bower to devDependencies to be able to build --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 7c2d932..0eeeb1a 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "karma-jasmine": "*", "karma-phantomjs-launcher": "*", "load-grunt-tasks": "^3.1.0", - "time-grunt": "^1.0.0" + "time-grunt": "^1.0.0", + "bower": "1.4.1" }, "engines": { "node": ">=0.10.0" From 90a54014185b72b9bcd49579b5cd95bf5eaa2263 Mon Sep 17 00:00:00 2001 From: Alexander Bezzubov Date: Fri, 26 Jun 2015 12:08:42 +0900 Subject: [PATCH 3/4] Updating bower wrapper --- bower | 7 ++++++- grunt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) mode change 100644 => 100755 bower diff --git a/bower b/bower old mode 100644 new mode 100755 index ed00320..2bea1c3 --- a/bower +++ b/bower @@ -14,4 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -"node/node" "./node_modules/bower/bin/bower" "$@" +node="node/node" + +if hash "node" 2>/dev/null ; then + node="node" +fi +"${node}" "./node_modules/bower/bin/bower" "$@" diff --git a/grunt b/grunt index f0dea57..af198ed 100755 --- a/grunt +++ b/grunt @@ -19,5 +19,5 @@ node="node/node" if hash "node" 2>/dev/null ; then node="node" fi -"$node" "./node_modules/.bin/grunt" "$@" +"${node}" "./node_modules/.bin/grunt" "$@" From 07901e4e32f724c384b965aa5cc93803e112bb73 Mon Sep 17 00:00:00 2001 From: Alexander Bezzubov Date: Fri, 26 Jun 2015 12:09:55 +0900 Subject: [PATCH 4/4] Update readme: enforce build instructions --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 97236f5..20a4345 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,10 @@ Zeppelin is a collaborative data analytic and visualization tool for distributed 1. NodeJS with npm 2. Bower -You can used - * bower install - * npm install +Run + * `npm install` first + * `bower install` then + This will Download all the dependencies including node js and npm ### Build the application