Merge pull request from ComputerDruid/fix-which-s

Use "command -v" to test for convert instead of "which -s"
This commit is contained in:
Robin Ward 2013-06-21 07:12:42 -07:00
commit 455742d3ee

View file

@ -107,7 +107,7 @@ class AdminDashboardData
end
def image_magick_check
I18n.t('dashboard.image_magick_warning') if SiteSetting.create_thumbnails and !system("which -s convert")
I18n.t('dashboard.image_magick_warning') if SiteSetting.create_thumbnails and !system("command -v convert >/dev/null;")
end
def failing_emails_check