github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 04:43:51 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #229 from sharelatex/force-npm-rebuild

Browse source 
force an npm rebuild to work around issue #129, missing bcrypt bindings
This commit is contained in:
James Allen 2014-11-24 16:29:00 +00:00
commit d08f2dec97
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server-ce/Gruntfile.coffee
View file

@ -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"