Merged master into develop

Doodle3D · Jul 26, 2016 · daed629 · daed629
2 parents 4e18fa0 + 058fff8
commit daed629
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -22,10 +22,11 @@ module.exports = function(grunt) {
     				var gi = grunt.config('gitinfo');
     				var lbc = gi.local.branch.current;
 
-    				var tag = (gi.tag == '') ? 'no_tag' : gi.tag;
+    				var tags = (gi.tag == '') ? 'no_tag' : gi.tag;
+            tags = tags.split('\n').join(',');
     				var commitMsg = lbc.lastCommitMessage.slice(1, -1).split('\n')[0].replace(/"/g, '\\\"');
 
-    				var buildInfo = lbc.shortSHA + "/" + lbc.name + "/" + tag +
+    				var buildInfo = lbc.shortSHA + "/" + lbc.name + "/" + tags +
     						" (" + lbc.lastCommitTime.slice(1, -1) + "; \'" + commitMsg + "'";
     				return { 'build_info': buildInfo };
     			}

diff --git a/package.json b/package.json
@@ -20,5 +20,8 @@
     "grunt-contrib-concat": "~0.3.0",
     "grunt-gitinfo": "~0.1.7",
     "grunt-template": "~0.2.3"
+  },
+  "scripts": {
+    "start": "grunt"
   }
 }