From 45c19e44f07dd33ccc246ea331f229a4d460f720 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 24 Nov 2017 11:53:49 -0500 Subject: [PATCH] assets rake task: only try and detect brotli if COMPRESS_BROTLI is set --- lib/tasks/assets.rake | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index 4116cd12bbe..75f7db109b1 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake @@ -115,20 +115,22 @@ def gzip(path) raise "gzip compression failed: exit code #{$?.exitstatus}" if $?.exitstatus != 0 end -# different brotli versions use different parameters -ver_out, ver_err, ver_status = Open3.capture3('brotli --version') -if !ver_status.success? - # old versions of brotli don't respond to --version - def brotli_command(path) - "brotli --quality 11 --input #{path} --output #{path}.br" +if ENV['COMPRESS_BROTLI']&.to_i == 1 + # different brotli versions use different parameters + ver_out, ver_err, ver_status = Open3.capture3('brotli --version') + if !ver_status.success? + # old versions of brotli don't respond to --version + def brotli_command(path) + "brotli --quality 11 --input #{path} --output #{path}.br" + end + elsif ver_out >= "brotli 1.0.0" + def brotli_command(path) + "brotli --quality=11 #{path} --output=#{path}.br" + end + else + # not sure what to do here, not expecting this + raise "cannot determine brotli version" end -elsif ver_out >= "brotli 1.0.0" - def brotli_command(path) - "brotli --quality=11 #{path} --output=#{path}.br" - end -else - # not sure what to do here, not expecting this - raise "cannot determine brotli version" end def brotli(path)