lib/paperclip.rb in paperclip-2.7.0 vs lib/paperclip.rb in paperclip-2.7.1

@@ -95,10 +95,10 @@
     def run(cmd, arguments = "", local_options = {})
       if options[:image_magick_path]
         Paperclip.log("[DEPRECATION] :image_magick_path is deprecated and will be removed. Use :command_path instead")
       end
       command_path = options[:command_path] || options[:image_magick_path]
-      Cocaine::CommandLine.path = ( Cocaine::CommandLine.path ? [Cocaine::CommandLine.path, command_path ].flatten : command_path )
+      Cocaine::CommandLine.path = [Cocaine::CommandLine.path, command_path].flatten.compact.uniq
       local_options = local_options.merge(:logger => logger) if logging? && (options[:log_command] || local_options[:log_command])
       Cocaine::CommandLine.new(cmd, arguments, local_options).run
     end
 
     def processor(name) #:nodoc: