From 62eddf8982d9d1c50ed74b2c365e2fb7bcc73564 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 23 Jun 2016 17:13:12 +0100 Subject: [PATCH] checkout the correct version --- server-ce/Gruntfile.coffee | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/server-ce/Gruntfile.coffee b/server-ce/Gruntfile.coffee index 01a31e5370..1d3957f16f 100644 --- a/server-ce/Gruntfile.coffee +++ b/server-ce/Gruntfile.coffee @@ -132,7 +132,9 @@ module.exports = (grunt) -> ["check:make"].concat( ("install:#{service.name}" for service in SERVICES) ).concat([ "install:dirs"]) + grunt.registerTask 'install', 'install:all' + grunt.registerTask 'update:all', "Checkout and update all ShareLaTeX services", ["check:make"].concat( ("update:#{service.name}" for service in SERVICES) @@ -194,16 +196,21 @@ module.exports = (grunt) -> if !fs.existsSync(dir) proc = spawn "git", [ "clone", - "-b", service.version, repo_src, dir ], stdio: "inherit" proc.on "close", () -> - callback() + Helpers.checkoutVersion service, callback else console.log "#{dir} already installed, skipping." callback() + checkoutVersion: (service, callback = (error) ->) -> + dir = service.name + proc = spawn "git", ["checkout", service.version], stdio: "inherit", cwd: dir + proc.on "close", () -> + callback() + updateGitRepo: (service, callback = (error) ->) -> dir = service.name proc = spawn "git", ["checkout", service.version], cwd: dir, stdio: "inherit"