diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-09-03 10:34:06 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-09-03 10:34:06 -0500 |
| commit | 85446cc30c97a326d90b4ef719ba2e54c2ad423f (patch) | |
| tree | caa8e1268cbab2a09e414b85d2ce52b24249d0da /lib/mix | |
| parent | 6ce28c409137972ee9b105b9d7ab4a0fd2a0d08b (diff) | |
| parent | 9433311923d4b41b057ce6cb1632ff27d46919b4 (diff) | |
| download | pleroma-85446cc30c97a326d90b4ef719ba2e54c2ad423f.tar.gz pleroma-85446cc30c97a326d90b4ef719ba2e54c2ad423f.zip | |
Merge branch 'develop' into media-preview-proxy
Diffstat (limited to 'lib/mix')
| -rw-r--r-- | lib/mix/tasks/pleroma/frontend.ex | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/mix/tasks/pleroma/frontend.ex b/lib/mix/tasks/pleroma/frontend.ex index 2adbf8d72..1957b1d84 100644 --- a/lib/mix/tasks/pleroma/frontend.ex +++ b/lib/mix/tasks/pleroma/frontend.ex @@ -69,7 +69,7 @@ defmodule Mix.Tasks.Pleroma.Frontend do fe_label = "#{frontend} (#{ref})" - tmp_dir = Path.join(dest, "tmp") + tmp_dir = Path.join([instance_static_dir, "frontends", "tmp"]) with {_, :ok} <- {:download_or_unzip, download_or_unzip(frontend_info, tmp_dir, options[:file])}, @@ -124,7 +124,9 @@ defmodule Mix.Tasks.Pleroma.Frontend do url = String.replace(frontend_info["build_url"], "${ref}", frontend_info["ref"]) with {:ok, %{status: 200, body: zip_body}} <- - Pleroma.HTTP.get(url, [], timeout: 120_000, recv_timeout: 120_000) do + Pleroma.HTTP.get(url, [], + adapter: [pool: :media, timeout: 120_000, recv_timeout: 120_000] + ) do unzip(zip_body, dest) else e -> {:error, e} @@ -133,6 +135,7 @@ defmodule Mix.Tasks.Pleroma.Frontend do defp install_frontend(frontend_info, source, dest) do from = frontend_info["build_dir"] || "dist" + File.rm_rf!(dest) File.mkdir_p!(dest) File.cp_r!(Path.join([source, from]), dest) :ok |