From c41540fc026cecf131630d991eefa66fc45098e7 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 20 Sep 2016 17:08:38 +0100 Subject: [PATCH] =?UTF-8?q?remove=20helpers=20we=20don=E2=80=99t=20use?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server-ce/Gruntfile.coffee | 180 ------------------------------------- 1 file changed, 180 deletions(-) diff --git a/server-ce/Gruntfile.coffee b/server-ce/Gruntfile.coffee index b30c403709..8bb11e01ee 100644 --- a/server-ce/Gruntfile.coffee +++ b/server-ce/Gruntfile.coffee @@ -103,16 +103,6 @@ module.exports = (grunt) -> grunt.registerTask "check:redis", "Check that redis is installed and running", () -> Helpers.checkRedisConnect @async() - grunt.registerTask "check:latexmk", "Check that latexmk is installed", () -> - Helpers.checkLatexmk @async() - grunt.registerTask "check:s3", "Check that Amazon S3 credentials are configured", () -> - Helpers.checkS3 @async() - grunt.registerTask "check:fs", "Check that local filesystem options are configured", () -> - Helpers.checkFS @async() - grunt.registerTask "check:aspell", "Check that aspell is installed", () -> - Helpers.checkAspell @async() - grunt.registerTask "check:make", "Check that make is installed", () -> - Helpers.checkMake @async() grunt.registerTask "check:mongo", "Check that make is installed", () -> Helpers.checkMongoConnect @async() @@ -181,176 +171,6 @@ module.exports = (grunt) -> proc.on "close", () -> callback() - checkRedis: (callback = (error) ->) -> - grunt.log.write "Checking Redis is running... " - exec "redis-cli info", (error, stdout, stderr) -> - if error? and error.message.match("Could not connect") - grunt.log.error "FAIL. Redis is not running" - return callback(error) - else if error? - return callback(error) - else - m = stdout.match(/redis_version:(.*)/) - if !m? - grunt.log.error "FAIL." - grunt.log.error "Unknown redis version" - error = new Error("Unknown redis version") - else - version = m[1] - if semver.gte(version, "2.6.12") - grunt.log.writeln "OK." - grunt.log.writeln "Running Redis version #{version}" - else - grunt.log.error "FAIL." - grunt.log.error "Redis version is too old (#{version}). Must be 2.6.12 or greater." - error = new Error("Redis version is too old (#{version}). Must be 2.6.12 or greater.") - callback(error) - - checkLatexmk: (callback = (error) ->) -> - grunt.log.write "Checking latexmk is installed... " - exec "latexmk --version", (error, stdout, stderr) -> - if error? and error.message.match("not found") - grunt.log.error "FAIL." - grunt.log.errorlns """ - Either latexmk is not installed or is not in your PATH. - - latexmk comes with TexLive 2013, and must be a version from 2013 or later. - If you have already have TeXLive installed, then make sure it is - included in your PATH (example for 64-bit linux): - - export PATH=$PATH:/usr/local/texlive/2014/bin/x86_64-linux/ - - This is a not a fatal error, but compiling will not work without latexmk. - """ - return callback(error) - else if error? - return callback(error) - else - m = stdout.match(/Version (.*)/) - if !m? - grunt.log.error "FAIL." - grunt.log.error "Unknown latexmk version" - error = new Error("Unknown latexmk version") - else - version = m[1] - if semver.gte(version + ".0", "4.39.0") - grunt.log.writeln "OK." - grunt.log.writeln "Running latexmk version #{version}" - else - grunt.log.error "FAIL." - grunt.log.errorlns """ - latexmk version is too old (#{version}). Must be 4.39 or greater. - This is a not a fatal error, but compiling will not work without latexmk - """ - error = new Error("latexmk is too old") - callback(error) - - checkAspell: (callback = (error) ->) -> - grunt.log.write "Checking aspell is installed... " - exec "aspell dump dicts", (error, stdout, stderr) -> - if error? and error.message.match("not found") - grunt.log.error "FAIL." - grunt.log.errorlns """ - Either aspell is not installed or is not in your PATH. - - On Ubuntu you can install aspell with: - - sudo apt-get install aspell - - Or on a mac: - - brew install aspell - - This is not a fatal error, but the spell-checker will not work without aspell - """ - return callback(error) - else if error? - return callback(error) - else - grunt.log.writeln "OK." - grunt.log.writeln "The following spell check dictionaries are available:" - grunt.log.write stdout - callback() - callback(error) - - checkS3: (callback = (error) ->) -> - Settings = require "settings-sharelatex" - if Settings.filestore.backend=="" - grunt.log.writeln "No backend specified. Assuming Amazon S3" - Settings.filestore.backend = "s3" - if Settings.filestore.backend=="s3" - grunt.log.write "Checking S3 credentials... " - try - client = knox.createClient({ - key: Settings.filestore.s3.key - secret: Settings.filestore.s3.secret - bucket: Settings.filestore.stores.user_files - }) - catch e - grunt.log.error "FAIL." - grunt.log.errorlns """ - Please configure your Amazon S3 credentials in config/settings.development.coffee - - Amazon S3 (Simple Storage Service) is a cloud storage service provided by - Amazon. ShareLaTeX uses S3 for storing binary files like images. You can - sign up for an account and find out more at: - - http://aws.amazon.com/s3/ - - """ - return callback() - client.getFile "does-not-exist", (error, response) -> - unless response? and response.statusCode == 404 - grunt.log.error "FAIL." - grunt.log.errorlns """ - Could not connect to Amazon S3. Please check your credentials. - """ - else - grunt.log.writeln "OK." - callback() - else - grunt.log.writeln "Filestore other than S3 configured. Not checking S3." - callback() - - checkFS: (callback = (error) ->) -> - Settings = require "settings-sharelatex" - if Settings.filestore.backend=="fs" - grunt.log.write "Checking FS configuration... " - fs = require("fs") - fs.exists Settings.filestore.stores.user_files, (exists) -> - if exists - grunt.log.writeln "OK." - else - grunt.log.error "FAIL." - grunt.log.errorlns """ - Could not find directory "#{Settings.filestore.stores.user_files}". - Please check your configuration. - """ - callback() - else - grunt.log.writeln "Filestore other than FS configured. Not checking FS." - callback() - - checkMake: (callback = (error) ->) -> - grunt.log.write "Checking make is installed... " - exec "make --version", (error, stdout, stderr) -> - if error? and error.message.match("not found") - grunt.log.error "FAIL." - grunt.log.errorlns """ - Either make is not installed or is not in your path. - - On Ubuntu you can install make with: - - sudo apt-get install build-essential - - """ - return callback(error) - else if error? - return callback(error) - else - grunt.log.write "OK." - return callback() - checkMongoConnect: (callback = (error) ->) -> grunt.log.write "Checking can connect to mongo"