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

diff --git a/config/configuration.yml.example b/config/configuration.yml.example
index a8b6be83c3cab1652922a988b665c4d2b52d47f9..5dbb7170c0fe6e9aaddb557ae86ed8544f157740 100644 (file)
--- 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 79f7843939a90c56b42a02404fd582a16584960a..cc9656b3e25818fc0054d24d2ae422966e42d9ba 100644 (file)
--- 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