diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-08-07 09:48:34 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-08-07 09:48:34 +0300 |
commit | 8e90cc58e7ec3f19f03d049ff541750f1ab4774e (patch) | |
tree | be0a4346827a52fcdfe034c489ede989320a24d2 /lib/pleroma/application.ex | |
parent | 6e6276b4f8a7a46c6038480f6a842339c5214d1c (diff) | |
parent | b9ebb55d2aabdf4c99b05efab9d4ad31b25f888d (diff) | |
download | pleroma-8e90cc58e7ec3f19f03d049ff541750f1ab4774e.tar.gz |
Merge branch 'develop' into feature/update-welcome-setting-in-description
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r-- | lib/pleroma/application.ex | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 0ffb55358..c0b5db9f1 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -47,6 +47,7 @@ defmodule Pleroma.Application do Pleroma.ApplicationRequirements.verify!() setup_instrumenters() load_custom_modules() + check_system_commands() Pleroma.Docs.JSON.compile() adapter = Application.get_env(:tesla, :adapter) @@ -249,4 +250,21 @@ defmodule Pleroma.Application do end defp http_children(_, _), do: [] + + defp check_system_commands do + filters = Config.get([Pleroma.Upload, :filters]) + + check_filter = fn filter, command_required -> + with true <- filter in filters, + false <- Pleroma.Utils.command_available?(command_required) do + Logger.error( + "#{filter} is specified in list of Pleroma.Upload filters, but the #{command_required} command is not found" + ) + end + end + + check_filter.(Pleroma.Upload.Filters.Exiftool, "exiftool") + check_filter.(Pleroma.Upload.Filters.Mogrify, "mogrify") + check_filter.(Pleroma.Upload.Filters.Mogrifun, "mogrify") + end end |