Browse Source

fix: match 2 or 3 version precision for git

NGPixel 8 years ago
parent
commit
d5c13c4061
1 changed files with 2 additions and 2 deletions
  1. 2 2
      server/configure.js

+ 2 - 2
server/configure.js

@@ -100,8 +100,8 @@ module.exports = (port, spinner) => {
             if (err || stdout.length < 3) {
             if (err || stdout.length < 3) {
               reject(new Error('Git is not installed or not reachable from PATH.'))
               reject(new Error('Git is not installed or not reachable from PATH.'))
             }
             }
-            let gitver = _.head(stdout.match(/[\d]+\.[\d]+\.[\d]+/g))
-            if (!semver.satisfies(semver.clean(gitver), '>=2.7.4')) {
+            let gitver = _.head(stdout.match(/[\d]+\.[\d]+(\.[\d]+)?/gi))
+            if (!gitver || !semver.satisfies(semver.clean(gitver), '>=2.7.4')) {
               reject(new Error('Git version is too old. Minimum is v2.7.4.'))
               reject(new Error('Git version is too old. Minimum is v2.7.4.'))
             }
             }
             resolve('Git v' + gitver + ' detected. Minimum is v2.7.4.')
             resolve('Git v' + gitver + ' detected. Minimum is v2.7.4.')