From 7ac73fa6f41862e9d819cdb71dd7bb95c5f59715 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Mon, 20 Apr 2020 14:16:31 +0000 Subject: [PATCH] Merged r19712 from trunk to 4.1-stable (#33283). git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19713 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/configuration.yml.example | 4 ++++ lib/redmine/thumbnail.rb | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/configuration.yml.example b/config/configuration.yml.example index a8b6be83c..5dbb7170c 100644 --- a/config/configuration.yml.example +++ b/config/configuration.yml.example @@ -179,6 +179,10 @@ default: # the ImageMagick's `convert` binary. Used to generate attachment thumbnails. #imagemagick_convert_command: + # Absolute path (e.g. /usr/bin/gs, c:/ghostscript/gs.exe) to + # the `gs` binary. Used to generate attachment thumbnails of PDF files. + #gs_command: + # Configuration of MiniMagick font. # # Redmine uses MiniMagick in order to export a gantt chart to a PNG image. diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb index 79f784393..cc9656b3e 100644 --- a/lib/redmine/thumbnail.rb +++ b/lib/redmine/thumbnail.rb @@ -25,6 +25,7 @@ module Redmine extend Redmine::Utils::Shell CONVERT_BIN = (Redmine::Configuration['imagemagick_convert_command'] || 'convert').freeze + GS_BIN = (Redmine::Configuration['gs_command'] || 'gs').freeze ALLOWED_TYPES = %w(image/bmp image/gif image/jpeg image/png application/pdf) # Generates a thumbnail for the source image to target @@ -79,12 +80,13 @@ module Redmine @gs_available = false else begin - `gs -version` + `#{shell_quote GS_BIN} -version` @gs_available = $?.success? rescue @gs_available = false end end + logger.warn("gs binary (#{GS_BIN}) not available") unless @gs_available @gs_available end -- 2.39.5