summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2020-07-11 15:48:45 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2020-07-11 15:48:45 +0300
commitaedbbec88aa0a9a38e588eabfbecb8058652002b (patch)
treeb3203d2efedaf60e199040ae70d7be1212fba763 /mix.exs
parent11dd29ef3f9bb5b0b3109eb572c3d5ae2c830ea3 (diff)
Add Pleroma.Utils.command_available?/1 and use where appropriate
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs6
1 files changed, 3 insertions, 3 deletions
diff --git a/mix.exs b/mix.exs
index d7992ee37..5cd06e8fd 100644
--- a/mix.exs
+++ b/mix.exs
@@ -234,10 +234,10 @@ defmodule Pleroma.Mixfile do
defp version(version) do
identifier_filter = ~r/[^0-9a-z\-]+/i
- {_cmdgit, cmdgit_err} = System.cmd("sh", ["-c", "command -v git"])
+ git_available? = Pleroma.Utils.command_available?("git")
git_pre_release =
- if cmdgit_err == 0 do
+ if git_available? do
{tag, tag_err} =
System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true)
@@ -263,7 +263,7 @@ defmodule Pleroma.Mixfile do
# Branch name as pre-release version component, denoted with a dot
branch_name =
- with 0 <- cmdgit_err,
+ with true <- git_available?,
{branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
branch_name <- String.trim(branch_name),
branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,