From 51f65713fee1a0839835e5ac52e9fb5c6583caaa Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Mon, 27 Mar 2017 11:56:05 -0300 Subject: [PATCH] update compile-version.js --- .../plugin/compile-version.js | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/packages/rocketchat-version/plugin/compile-version.js b/packages/rocketchat-version/plugin/compile-version.js index 146a9307bc5..f69e9bc82ef 100644 --- a/packages/rocketchat-version/plugin/compile-version.js +++ b/packages/rocketchat-version/plugin/compile-version.js @@ -1,12 +1,9 @@ //let Future, VersionCompiler, async, exec, os; -let VersionCompiler = undefined; +let VersionCompiler = undefined; const exec = Npm.require('child_process').exec; - const os = Npm.require('os'); - const Future = Npm.require('fibers/future'); - const async = Npm.require('async'); Plugin.registerCompiler({ @@ -21,11 +18,10 @@ VersionCompiler = (function() { VersionCompiler.prototype.processFilesForTarget = function(files) { const future = new Future; const processFile = function(file, cb) { - let output; if (!file.getDisplayPath().match(/rocketchat\.info$/)) { return cb(); } - output = JSON.parse(file.getContentsAsString()); + let output = JSON.parse(file.getContentsAsString()); output.build = { date: new Date().toISOString(), nodeVersion: process.version, @@ -54,18 +50,12 @@ VersionCompiler = (function() { }; } return exec('git describe --abbrev=0 --tags', function(err, result) { - let ref; - if (err == null) { - if ((ref = output.commit) != null) { - ref.tag = result.replace('\n', ''); - } + if (err == null && output.commit != null) { + output.commit.tag = result.replace('\n', ''); } return exec('git rev-parse --abbrev-ref HEAD', function(err, result) { - let ref1; - if (err == null) { - if ((ref1 = output.commit) != null) { - ref1.branch = result.replace('\n', ''); - } + if (err == null && output.commit != null) { + output.commit.branch = result.replace('\n', ''); } output = `RocketChat.Info = ${ JSON.stringify(output, null, 4) };`; file.addJavaScript({