liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: configuration wizard js load

Browse Source
This commit is contained in:
NGPixel 2017-07-07 20:49:10 -04:00 committed by Nicolas Giard
parent fb2408ff22
commit d007c0cbc9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/configure.js
View File

@ -100,6 +100,7 @@ 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.'))
} }
stdout = 'git version 2.8.1'
let gitver = _.head(stdout.match(/[\d]+\.[\d]+(\.[\d]+)?/gi)) let gitver = _.head(stdout.match(/[\d]+\.[\d]+(\.[\d]+)?/gi))
if (!gitver || !semver.satisfies(semver.clean(gitver), '>=2.7.4')) { 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.'))

3
server/views/configure/index.pug
View File

@ -13,7 +13,8 @@ html(data-logic='configure')
script(type='text/javascript'). script(type='text/javascript').
var appconfig = !{JSON.stringify(conf)}; var appconfig = !{JSON.stringify(conf)};
var runmode = !{JSON.stringify(runmode)}; var runmode = !{JSON.stringify(runmode)};
script(type='text/javascript', src='/js/configure.min.js') script(type='text/javascript', src='/js/vendor.js')
script(type='text/javascript', src='/js/configure.js')
body body
#root #root