Merge pull request #8 from bzz/fix-build

Fixing app build process
Madhuka · Jun 26, 2015 · b84075e · b84075e
2 parents 79cdaa4 + 07901e4
commit b84075e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -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",
@@ -29,12 +30,13 @@
     "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"
   },
   "scripts": {
     "test": "grunt test"
   }
-}
+}