mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Merge pull request #229 from sharelatex/force-npm-rebuild
force an npm rebuild to work around issue #129, missing bcrypt bindings
This commit is contained in:
commit
d08f2dec97
1 changed files with 18 additions and 6 deletions
|
@ -152,6 +152,8 @@ module.exports = (grunt) ->
|
||||||
Helpers.cloneGitRepo service, (error) ->
|
Helpers.cloneGitRepo service, (error) ->
|
||||||
return callback(error) if error?
|
return callback(error) if error?
|
||||||
Helpers.installNpmModules service, (error) ->
|
Helpers.installNpmModules service, (error) ->
|
||||||
|
return callback(error) if error?
|
||||||
|
Helpers.rebuildNpmModules service, (error) ->
|
||||||
return callback(error) if error?
|
return callback(error) if error?
|
||||||
Helpers.runGruntInstall service, (error) ->
|
Helpers.runGruntInstall service, (error) ->
|
||||||
return callback(error) if error?
|
return callback(error) if error?
|
||||||
|
@ -161,6 +163,8 @@ module.exports = (grunt) ->
|
||||||
Helpers.updateGitRepo service, (error) ->
|
Helpers.updateGitRepo service, (error) ->
|
||||||
return callback(error) if error?
|
return callback(error) if error?
|
||||||
Helpers.installNpmModules service, (error) ->
|
Helpers.installNpmModules service, (error) ->
|
||||||
|
return callback(error) if error?
|
||||||
|
Helpers.rebuildNpmModules service, (error) ->
|
||||||
return callback(error) if error?
|
return callback(error) if error?
|
||||||
Helpers.runGruntInstall service, (error) ->
|
Helpers.runGruntInstall service, (error) ->
|
||||||
return callback(error) if error?
|
return callback(error) if error?
|
||||||
|
@ -214,6 +218,14 @@ module.exports = (grunt) ->
|
||||||
proc.on "close", () ->
|
proc.on "close", () ->
|
||||||
callback()
|
callback()
|
||||||
|
|
||||||
|
# work around for https://github.com/npm/npm/issues/5400
|
||||||
|
# where binary modules are not built due to bug in npm
|
||||||
|
rebuildNpmModules: (service, callback = (error) ->) ->
|
||||||
|
dir = service.name
|
||||||
|
proc = spawn "npm", ["rebuild"], stdio: "inherit", cwd: dir
|
||||||
|
proc.on "close", () ->
|
||||||
|
callback()
|
||||||
|
|
||||||
createDataDirs: (callback = (error) ->) ->
|
createDataDirs: (callback = (error) ->) ->
|
||||||
DIRS = [
|
DIRS = [
|
||||||
"tmp/dumpFolder"
|
"tmp/dumpFolder"
|
||||||
|
|
Loading…
Reference in a new issue