diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-08 14:23:41 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-08 14:23:59 +0300 |
| commit | a85194e94d86f18bb3dc72e54861c6c2112f7b84 (patch) | |
| tree | 64507d256c8dce1a4f30221377b925ad4f4a8a94 /lib/mix/tasks/pleroma/emoji.ex | |
| parent | 252a65dc18d4bf5c53ffff5eadb878e9d063c520 (diff) | |
| parent | 6d797b99282ff1067c6af04b3e1775ff2281333b (diff) | |
| download | pleroma-issue/1469.tar.gz | |
Merge branch 'develop' into issue/1469issue/1469
Diffstat (limited to 'lib/mix/tasks/pleroma/emoji.ex')
| -rw-r--r-- | lib/mix/tasks/pleroma/emoji.ex | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex index 24d999707..2b03a3009 100644 --- a/lib/mix/tasks/pleroma/emoji.ex +++ b/lib/mix/tasks/pleroma/emoji.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Mix.Tasks.Pleroma.Emoji do @@ -186,11 +186,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do tmp_pack_dir = Path.join(System.tmp_dir!(), "emoji-pack-#{name}") - {:ok, _} = - :zip.unzip( - binary_archive, - cwd: tmp_pack_dir - ) + {:ok, _} = :zip.unzip(binary_archive, cwd: String.to_charlist(tmp_pack_dir)) emoji_map = Pleroma.Emoji.Loader.make_shortcode_to_file_map(tmp_pack_dir, exts) |