diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-29 16:37:50 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-29 16:37:50 +0400 |
| commit | d83c2bd330d1ed01b84634b70dfe024020ebfd6c (patch) | |
| tree | ab09243b13e9c4e0ecd452adb3bc1f0d8e2ebee5 /lib/pleroma/frontend.ex | |
| parent | 03e306785b2013fe6fd47b59d4e578c6ed586b08 (diff) | |
| download | pleroma-d83c2bd330d1ed01b84634b70dfe024020ebfd6c.tar.gz | |
Add support for install via `file` and `build_url` params
Diffstat (limited to 'lib/pleroma/frontend.ex')
| -rw-r--r-- | lib/pleroma/frontend.ex | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/frontend.ex b/lib/pleroma/frontend.ex index 3413d2fba..b3d4c3325 100644 --- a/lib/pleroma/frontend.ex +++ b/lib/pleroma/frontend.ex @@ -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) |