From 5b11543c96427ced093c28c38de0924a148424b7 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Wed, 15 Jun 2022 18:18:23 +0100 Subject: [PATCH] update pleroma-fe url --- config/config.exs | 7 ++++--- lib/pleroma/frontend.ex | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config/config.exs b/config/config.exs index ad7096669..f4915a909 100644 --- a/config/config.exs +++ b/config/config.exs @@ -734,10 +734,11 @@ }, "pleroma-fe" => %{ "name" => "pleroma-fe", - "git" => "https://git.pleroma.social/pleroma/pleroma-fe", + "git" => "https://akkoma.dev/AkkomaGang/pleroma-fe", "build_url" => - "https://git.pleroma.social/pleroma/pleroma-fe/-/jobs/artifacts/${ref}/download?job=build", - "ref" => "develop" + "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/akkoma-fe.zip", + "ref" => "develop", + "build_dir" => "dist" }, "fedi-fe" => %{ "name" => "fedi-fe", diff --git a/lib/pleroma/frontend.ex b/lib/pleroma/frontend.ex index 34b7befb8..cc0b47077 100644 --- a/lib/pleroma/frontend.ex +++ b/lib/pleroma/frontend.ex @@ -32,20 +32,20 @@ def install(name, opts \\ []) do label = "#{name} (#{ref})" tmp_dir = Path.join(dir(), "tmp") - + IO.puts("Downloading #{label}...") with {_, :ok} <- {:download_or_unzip, download_or_unzip(frontend_info, tmp_dir, opts[:file])}, - Logger.info("Installing #{label} to #{dest}"), + IO.puts("Installing #{label} to #{dest}"), :ok <- install_frontend(frontend_info, tmp_dir, dest) do File.rm_rf!(tmp_dir) - Logger.info("Frontend #{label} installed to #{dest}") + IO.puts("Frontend #{label} installed to #{dest}") else {:download_or_unzip, _} -> - Logger.info("Could not download or unzip the frontend") + IO.puts("Could not download or unzip the frontend") {:error, "Could not download or unzip the frontend"} _e -> - Logger.info("Could not install the frontend") + IO.puts("Could not install the frontend") {:error, "Could not install the frontend"} end end