Skip to content
Snippets Groups Projects
Commit 2d83874e authored by codedust's avatar codedust
Browse files

Config parameter for version regex

parent eaa374d0
No related branches found
No related tags found
No related merge requests found
...@@ -113,6 +113,12 @@ var firmwarewizard = function() { ...@@ -113,6 +113,12 @@ var firmwarewizard = function() {
var reRemoveSpaces = new RegExp(/ /g); var reRemoveSpaces = new RegExp(/ /g);
var reStripDashes = new RegExp(/^\-+|\-+$/g); var reStripDashes = new RegExp(/^\-+|\-+$/g);
if (config.version_regex === undefined) {
console.log("config.version_regex missing in config.js");
return;
}
var reVersionRegex = new RegExp(config.version_regex);
function buildVendorModelsReverse() { function buildVendorModelsReverse() {
var vendormodels_reverse = {}; var vendormodels_reverse = {};
...@@ -281,7 +287,7 @@ var firmwarewizard = function() { ...@@ -281,7 +287,7 @@ var firmwarewizard = function() {
function findVersion(name) { function findVersion(name) {
// version with optional date in it (e.g. 0.8.0~20160502) // version with optional date in it (e.g. 0.8.0~20160502)
var m = /-([0-9]+.[0-9]+.[0-9]+([+-][0-9]+)?(~[a-z0-9]+)?)[.-]/.exec(name); var m = reVersionRegex.exec(name);
return m ? m[1] : ''; return m ? m[1] : '';
} }
......
...@@ -20,6 +20,8 @@ var config = { ...@@ -20,6 +20,8 @@ var config = {
vendormodels: vendormodels, vendormodels: vendormodels,
// community prefix of the firmware images // community prefix of the firmware images
community_prefix: 'gluon-ffda-', community_prefix: 'gluon-ffda-',
// firmware version regex
version_regex: '-([0-9]+.[0-9]+.[0-9]+([+-~][0-9]+)?)[.-]',
// relative image paths and branch // relative image paths and branch
directories: { directories: {
// some demo sources // some demo sources
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment