diff --git a/copay.js b/copay.js index 35178e9a3..5f058d6ab 100644 --- a/copay.js +++ b/copay.js @@ -16,7 +16,8 @@ var StorageLocalEncrypted = module.exports.StorageLocalEncrypted = require('./js module.exports.WalletFactory = require('./js/models/core/WalletFactory'); module.exports.Wallet = require('./js/models/core/Wallet'); module.exports.WalletLock = require('./js/models/core/WalletLock'); -module.exports.version = require('./version'); +module.exports.version = require('./version').version; +module.exports.commitHash = require('./version').commitHash; // test hack :s, will fix module.exports.FakePayProServer = require('./test/mocks/FakePayProServer'); diff --git a/js/controllers/version.js b/js/controllers/version.js index 5e886c44a..f00fcc13a 100644 --- a/js/controllers/version.js +++ b/js/controllers/version.js @@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('VersionController', function($scope, $rootScope, $http, notification) { $scope.version = copay.version; + $scope.commitHash = copay.commitHash; $scope.networkName = config.networkName; $http.get('https://api.github.com/repos/bitpay/copay/tags').success(function(data) { diff --git a/util/build.js b/util/build.js index db14b847d..3382fbb3f 100644 --- a/util/build.js +++ b/util/build.js @@ -5,13 +5,25 @@ var fs = require('fs'); var browserify = require('browserify'); var exec = require('child_process').exec; +var shell = require('shelljs'); + var puts = function(error, stdout, stderr) { if (error) console.log(error); }; +var getCommitHash = function() { + //exec git command to get the hash of the current commit + //git rev-parse HEAD + + var hash = shell.exec('git rev-parse HEAD').output.trim().substr(0,10); + return hash; +} + var createVersion = function() { var json = JSON.parse(fs.readFileSync('./package.json', 'utf8')); - var content = 'module.exports="' + json.version + '";'; + var content = 'module.exports.version="' + json.version + '";'; + + content = content + '\nmodule.exports.commitHash="' + getCommitHash() + '";'; fs.writeFileSync("./version.js", content); }; diff --git a/views/includes/version.html b/views/includes/version.html index 664152ca4..f3a19d227 100644 --- a/views/includes/version.html +++ b/views/includes/version.html @@ -1,5 +1,6 @@
v{{version}} [ {{networkName}} ] + {{commitHash}}