;o custom subnets

1 files changed, 18 insertions, 3 deletions

diff --git a/mix.exs b/mix.exs
index e4ea136..7a490bb 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule LSG.Mixfile do
   def project do
     [
       app: :lsg,
-      version: "0.2.4",
+      version: version("0.2.4"),
       elixir: "~> 1.4",
       elixirc_paths: elixirc_paths(Mix.env),
       compilers: [:phoenix, :gettext] ++ Mix.compilers,
@@ -44,12 +44,12 @@ defmodule LSG.Mixfile do
       {:cowlib, "~> 2.9.1", override: true},
       {:plug, "~> 1.7"},
       {:gettext, "~> 0.11"},
-      {:httpoison, "~> 1.0"},
+      {:httpoison, "~> 1.8", override: true},
       {:jason, "~> 1.0"},
       {:poison, "~> 4.0", override: true},
       {:floki, "~> 0.19.3"},
       {:ecto, "~> 3.4"},
-      {:exirc, git: "https://git.random.sh/ircbot/exirc.git", branch: "fix-who-nick"},
+      {:exirc, path: "../exirc"}, #git: "https://git.random.sh/ircbot/exirc.git", branch: "fix-who-nick"},
       {:distillery, "~> 2.0"},
       {:earmark, "~> 1.2"},
       {:oauther, "~> 1.1"},
@@ -75,6 +75,21 @@ defmodule LSG.Mixfile do
       {:sentry, "~> 8.0.5"},
       {:logger_json, "~> 4.3"},
       {:oauth2, "~> 2.0"},
+      {:powerdnsex, git: "https://git.random.sh/ircbot/powerdnsex.git", branch: "master"},
+      {:pfx, "~> 0.7.0"},
     ]
   end
+
+  defp version(v) do
+    {describe, 0} = System.cmd("git", ~w(describe --dirty --broken --all --tags --long))
+    [_, rest] = String.split(describe, "/")
+    info = String.trim(rest)
+    env = cond do
+      Mix.env() == :prod -> ""
+      true -> "." <> to_string(Mix.env())
+    end
+
+    v <> "+" <> info <> env
+  end
+
 end