From b0a759ff2a7c77b918f24257c45f3e0140f7c16b Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 28 May 2014 12:28:43 +0100 Subject: [PATCH] Use spawn to run fpm --- Gruntfile.coffee | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index add7904afb..d5c96773fd 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -307,18 +307,18 @@ module.exports = (grunt) -> buildDeb: (callback = (error) ->) -> # TODO: filestore uses local 'uploads' directory, not configurable in settings - command = ["fpm", "-s", "dir", "-t", "deb", "-n", "sharelatex", "-v", "0.0.1", "--verbose"] + command = ["-s", "dir", "-t", "deb", "-n", "sharelatex", "-v", "0.0.1", "--verbose"] command.push( - "--maintainer", "'ShareLaTeX '" + "--maintainer", "ShareLaTeX " "--config-files", "/etc/sharelatex/settings.coffee", "--directories", "/var/data/sharelatex" "--directories", "/var/log/sharelatex" ) command.push( - "--depends", "'redis-server > 2.6.12'" - "--depends", "'mongodb-10gen > 2.4.0'" - "--depends", "'nodejs > 0.10.0'" + "--depends", "redis-server > 2.6.12" + "--depends", "mongodb-10gen > 2.4.0" + "--depends", "nodejs > 0.10.0" ) template = fs.readFileSync("package/upstart/sharelatex-template").toString() @@ -359,12 +359,9 @@ module.exports = (grunt) -> command.push( "package/config/settings.coffee=/etc/sharelatex/settings.coffee" ) - console.log command.join(" ") - exec command.join(" "), (error, stdout, stderr) -> - return callback(error) if error? - console.log stdout - console.error stderr if stderr? - callback() + console.log "fpm " + command.join(" ") + proc = spawn "fpm", command, stdio: "inherit" + proc.on "close", callback