logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: bd3d5951f303a2012cb702ac8e9d4ea114fdd118
parent: afaeabb20792af6512b51f2d41bf529b759e3163
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sun,  4 Feb 2018 00:23:50 +0100

upgrade.sh: Create

Diffstat:

M.gitignore1+
Mmix.exs2+-
Aupgrade.sh40++++++++++++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore @@ -14,6 +14,7 @@ # Prevent committing custom emojis /priv/static/emoji/custom/* +/config/emoji* # Generated on crash by the VM erl_crash.dump diff --git a/mix.exs b/mix.exs @@ -90,7 +90,7 @@ defmodule Pleroma.Mixfile do {:crypt, git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"}, {:cors_plug, "~> 1.5"}, - {:ex_doc, "~> 0.20.2", only: :dev, runtime: false}, + {:ex_doc, "~> 0.20.2", runtime: false}, {:web_push_encryption, "~> 0.2.1"}, {:swoosh, "~> 0.20"}, {:gen_smtp, "~> 0.13"}, diff --git a/upgrade.sh b/upgrade.sh @@ -0,0 +1,40 @@ +#!/bin/sh +export MIX_ENV=${MIX_ENV:-prod} +cd $(dirname "$0") +WORKDIR="$(pwd)" + +# DEPRECATED: Use globbing on emoji/custom/**/*.png instead +generate_emojo_config() { + [ -f "${WORKDIR}/config/emoji.txt" ] && mv "${WORKDIR}/config/emoji.txt" "${WORKDIR}/config/emoji.txt.old" + cp "${WORKDIR}/config/emoji_pleroma.txt" "${WORKDIR}/config/emoji.txt" + cd "${WORKDIR}/priv/static" + for emoji_pack in $(find emoji/ -mindepth 1 -maxdepth 1 -type d) + do + emoji_pack_name=$(basename ${emoji_pack}) + find ${emoji_pack} -type f -iregex '.*\.png' | sed -r 's;.*/(.*)\.png;\1, /\0;g' >> "${WORKDIR}/config/emoji.txt" + done + cd "${WORKDIR}" +} + +# DEPRECATED: Custom emojis are configured in custom_emoji.txt +concat_emojo_config() { + [ -f "${WORKDIR}/config/emoji.txt" ] && mv "${WORKDIR}/config/emoji.txt" "${WORKDIR}/config/emoji.txt.old" + cat "${WORKDIR}/config/emoji_"*".txt" > "${WORKDIR}/config/emoji.txt" +} + +git_update() { + if git pull -f --rebase --autostash + then + echo "git pull -f --… made it!" + else + echo "git pull -f --… failed, going to the longer way?" + echo "Press Return to continue, SIGINT(^C) to abort:" + read + git checkout develop + git branch -D dev-lanodan2 + git pull + git checkout dev-lanodan2 + fi +} + +git_update && mix deps.get && mix compile && mix ecto.migrate && mix docs