vmario
/
doodle3d-client
mirror of https://github.com/Doodle3D/doodle3d-client.git
0
0
Fork 0
Code Issues Releases Wiki Activity

Merged master into develop

This commit is contained in:
peteruithoven 2016-07-26 15:24:38 +02:00
parent 4e18fa0f56 058fff8b34
commit daed62937c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Gruntfile.js
View File

@ -22,10 +22,11 @@ module.exports = function(grunt) {
var gi = grunt.config('gitinfo'); var gi = grunt.config('gitinfo');
var lbc = gi.local.branch.current; 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 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 + "'"; " (" + lbc.lastCommitTime.slice(1, -1) + "; \'" + commitMsg + "'";
return { 'build_info': buildInfo }; return { 'build_info': buildInfo };
} }

3
package.json
View File

@ -20,5 +20,8 @@
"grunt-contrib-concat": "~0.3.0", "grunt-contrib-concat": "~0.3.0",
"grunt-gitinfo": "~0.1.7", "grunt-gitinfo": "~0.1.7",
"grunt-template": "~0.2.3" "grunt-template": "~0.2.3"
},
"scripts": {
"start": "grunt"
} }
} }