hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support for install via file and build_url params

Browse source
This commit is contained in:
Egor Kislitsyn 2020-10-29 16:37:50 +04:00
commit d83c2bd330
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
4 changed files with 74 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/frontend.ex
View file

@ -8,16 +8,16 @@ defmodule Pleroma.Frontend do
require Logger
def install(name, opts \\ []) do
cmd_frontend_info = %{
frontend_info = %{
"ref" => opts[:ref],
"build_url" => opts[:build_url],
"build_dir" => opts[:build_dir]
}
config_frontend_info = Config.get([:frontends, :available, name], %{})
frontend_info =
Map.merge(config_frontend_info, cmd_frontend_info, fn _key, config, cmd ->
[:frontends, :available, name]
|> Config.get(%{})
|> Map.merge(frontend_info, fn _key, config, cmd ->
# This only overrides things that are actually set
cmd || config
end)