summaryrefslogtreecommitdiff
path: root/lib/config/index.js
diff options
context:
space:
mode:
authorSheogorath2018-10-05 19:33:40 +0200
committerSheogorath2018-11-11 12:44:19 +0100
commitbcc914a7735290b86e0df428aed75dabdf9f1eca (patch)
treec7b2731235be1c08e3fc94cc85fd8ed21fac48e8 /lib/config/index.js
parent4e5e7df4f8ed5b4317ab9205ceb8c2b3231517ad (diff)
Add full version string
Currently we only provide the version from `package.json`. This means that during updates of instances, e.g. the demo instance, which runs latest master instead of a stable release, changes are not reflected to the webclient. This patch adds a fullversion string that contains the current commit and this way makes that clients are notified about changes. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
Diffstat (limited to 'lib/config/index.js')
-rw-r--r--lib/config/index.js11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/config/index.js b/lib/config/index.js
index 501fdca3..4e1fa50d 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -8,6 +8,7 @@ const {merge} = require('lodash')
const deepFreeze = require('deep-freeze')
const {Environment, Permission} = require('./enum')
const logger = require('../logger')
+const {getGitCommit, getGitHubURL} = require('./utils')
const appRootPath = path.resolve(__dirname, '../../')
const env = process.env.NODE_ENV || Environment.development
@@ -16,11 +17,17 @@ const debugConfig = {
}
// Get version string from package.json
-const {version} = require(path.join(appRootPath, 'package.json'))
+const {version, repository} = require(path.join(appRootPath, 'package.json'))
+
+const commitID = getGitCommit(appRootPath)
+const sourceURL = getGitHubURL(repository.url, commitID || version)
+const fullversion = commitID ? `${version}-${commitID}` : version
const packageConfig = {
version: version,
- minimumCompatibleVersion: '0.5.0'
+ minimumCompatibleVersion: '0.5.0',
+ fullversion: fullversion,
+ sourceURL: sourceURL
}
const configFilePath = path.resolve(appRootPath, process.env.CMD_CONFIG_FILE ||