From 8009b3f036861dcd124689be75591c5a8228931d Mon Sep 17 00:00:00 2001
From: Dan Johnson <ComputerDruid@gmail.com>
Date: Thu, 20 Jun 2013 21:42:18 -0400
Subject: [PATCH] Use "command -v" to test for convert instead of "which -s"
---
app/models/admin_dashboard_data.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index fe058a289..79b9425bd 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -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