diff options
| author | lain <lain@soykaf.club> | 2020-09-03 09:56:17 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-03 09:56:17 +0000 |
| commit | 1d743ca829027052f2f97f4d4ff5d35fc06e598c (patch) | |
| tree | bd5062f8c6fb760bf86de8944f549d9ad8e91c49 /lib | |
| parent | d1a6f67b1d92e17f4fe3cfc8f296879326897220 (diff) | |
| parent | 5da367760748f7c4534b84dcb9286d715110472e (diff) | |
| download | pleroma-1d743ca829027052f2f97f4d4ff5d35fc06e598c.tar.gz | |
Merge branch 'fix_install_fe_bug' into 'develop'
Fix frontend install mix task bug
See merge request pleroma/pleroma!2942
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mix/tasks/pleroma/frontend.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/frontend.ex b/lib/mix/tasks/pleroma/frontend.ex index 484af6da7..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])}, @@ -135,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 |