Dragonfly was mistakenly configured to use the convert command when i…

…dentifying
bjorntrondsen · Feb 4, 2013 · d23abdb · d23abdb
1 parent 2a48ed0
commit d23abdb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/lib/generators/locomotive/install/templates/dragonfly.rb b/lib/generators/locomotive/install/templates/dragonfly.rb
@@ -11,9 +11,8 @@
 Dragonfly[:images].configure do |c|
   # Convert absolute location needs to be specified
   # to avoid issues with Phusion Passenger not using $PATH
-  convert = `which convert`.strip.presence || "/usr/local/bin/convert"
-  c.convert_command  = convert
-  c.identify_command = convert
+  c.convert_command  = `which convert`.strip.presence || "/usr/local/bin/convert"
+  c.identify_command = `which identify`.strip.presence || "/usr/local/bin/identify"
 
   c.allow_fetch_url  = true
   c.allow_fetch_file = true

diff --git a/spec/dummy/config/initializers/dragonfly.rb b/spec/dummy/config/initializers/dragonfly.rb
@@ -11,12 +11,11 @@
 Dragonfly[:images].configure do |c|
   # Convert absolute location needs to be specified
   # to avoid issues with Phusion Passenger not using $PATH
-  convert = `which convert`.strip.presence || "/usr/local/bin/convert"
-  c.convert_command  = convert
-  c.identify_command = convert
+  c.convert_command  = `which convert`.strip.presence || "/usr/local/bin/convert"
+  c.identify_command = `which identify`.strip.presence || "/usr/local/bin/identify"
 
   c.allow_fetch_url  = true
   c.allow_fetch_file = true
 
   c.url_format = '/images/dynamic/:job/:basename.:format'
-end
+end