Skip to content

Commit 82cb19c

Browse files
committed
chore: move versions script to its own file
1 parent 23a0c9e commit 82cb19c

File tree

2 files changed

+18
-22
lines changed

2 files changed

+18
-22
lines changed

apps/expert/lib/expert/engine_node.ex

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,9 @@ defmodule Expert.EngineNode do
168168
# we have the right version downloaded, and if not, we should download it.
169169
defp glob_paths(%Project{} = project) do
170170
{:ok, elixir, _} = Expert.Port.elixir_executable(project)
171+
versions_script = Path.join([:code.priv_dir(:expert), "get_versions.exs"])
171172

172-
{output, _} = System.cmd(elixir, ["-e", get_versions_code()])
173+
{output, _} = System.cmd(elixir, [versions_script])
173174

174175
case output |> String.trim() |> String.split("-") do
175176
[elixir_vsn, erlang_vsn] ->
@@ -188,27 +189,6 @@ defmodule Expert.EngineNode do
188189
end
189190
end
190191

191-
defp get_versions_code() do
192-
~S"""
193-
major = :otp_release |> :erlang.system_info() |> List.to_string()
194-
version_file = Path.join([:code.root_dir(), "releases", major, "OTP_VERSION"])
195-
196-
erlang_vsn =
197-
try do
198-
{:ok, contents} = File.read(version_file)
199-
String.split(contents, "\n", trim: true)
200-
else
201-
[full] -> full
202-
_ -> major
203-
catch
204-
:error ->
205-
major
206-
end
207-
208-
IO.puts("#{System.version()}-#{erlang_vsn}")
209-
"""
210-
end
211-
212192
defp find_engine_build(elixir_vsn, erlang_vsn) do
213193
user_data_path = :filename.basedir(:user_data, "Expert", %{version: Expert.vsn()})
214194
engine_path = Path.join([user_data_path, "engine", "*-otp-*"])
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
major = :otp_release |> :erlang.system_info() |> List.to_string()
2+
version_file = Path.join([:code.root_dir(), "releases", major, "OTP_VERSION"])
3+
4+
erlang_vsn =
5+
try do
6+
{:ok, contents} = File.read(version_file)
7+
String.split(contents, "\n", trim: true)
8+
else
9+
[full] -> full
10+
_ -> major
11+
catch
12+
:error ->
13+
major
14+
end
15+
16+
IO.puts("#{System.version()}-#{erlang_vsn}")

0 commit comments

Comments
 (0)