Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

semver foxx plain func (#6293)

This commit is contained in:
Heiko 2018-08-29 20:26:03 +02:00 committed by Michael Hackstein
parent 462bfd0063
commit 6ac135e876
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/server/modules/@arangodb/index.js
View File

@ -26,6 +26,7 @@
module.isSystem = true; module.isSystem = true;
var common = require('@arangodb/common'); var common = require('@arangodb/common');
const semver = require('semver');
Object.keys(common).forEach(function (key) { Object.keys(common).forEach(function (key) {
exports[key] = common[key]; exports[key] = common[key];
@ -80,17 +81,21 @@ exports.db = internal.db;
exports.plainServerVersion = function () { exports.plainServerVersion = function () {
let version = internal.version; let version = internal.version;
let devel = version.match(/(.*)\.devel/);
if (semver.valid(version) === null) {
let devel = version.match(/(.*)\.devel/);
if (devel !== null) { if (devel !== null) {
version = devel[1] + '.0'; version = devel[1] + '.0';
} else { } else {
devel = version.match(/(.*)((milestone|alpha|beta|devel|rc)[0-9]*)$/); devel = version.match(/(.*)((milestone|alpha|beta|devel|rc)[0-9]*)$/);
if (devel !== null) { if (devel !== null) {
version = devel[1] + '0';; version = devel[1] + '0';
} }
} }
} else {
version = semver.major(version) + '.' + semver.minor(version) + '.' + semver.patch(version);
}
return version; return version;
}; };