From 76196e3bb729bf8fc29c8f638416b326a02f277b Mon Sep 17 00:00:00 2001
From: Wojtek Mach <wojtekmach@users.noreply.github.com>
Date: Thu, 14 Nov 2024 14:18:44 +0100
Subject: [PATCH] Vendor elixir, otp, archives per Livebook version (#2859)

---
 rel/app/env.bat.eex    |  7 ++++---
 rel/app/env.sh.eex     |  7 ++++---
 rel/app/standalone.exs | 12 ++++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/rel/app/env.bat.eex b/rel/app/env.bat.eex
index fb5d8da0a..99ca89f06 100644
--- a/rel/app/env.bat.eex
+++ b/rel/app/env.bat.eex
@@ -5,11 +5,12 @@ if exist "!USERPROFILE!\.livebookdesktop.bat" (
 set RELEASE_MODE=interactive
 set RELEASE_DISTRIBUTION=none
 
-set MIX_ARCHIVES=!RELEASE_ROOT!\vendor\archives
-set MIX_REBAR3=!RELEASE_ROOT!\vendor\rebar3
+set vendor_dir=!RELEASE_ROOT!\vendor\livebook-!RELEASE_VSN!
+set MIX_ARCHIVES=!vendor_dir!\archives
+set MIX_REBAR3=!vendor_dir!\rebar3
 if not defined LIVEBOOK_SHUTDOWN_ENABLED set LIVEBOOK_SHUTDOWN_ENABLED=true
 if not defined LIVEBOOK_PORT (set LIVEBOOK_PORT=0)
-set PATH=!RELEASE_ROOT!\vendor\otp\erts-<%= @release.erts_version%>\bin;!RELEASE_ROOT!\vendor\otp\bin;!RELEASE_ROOT!\vendor\elixir\bin;!PATH!
+set PATH=!vendor_dir!\otp\erts-<%= @release.erts_version%>\bin;!vendor_dir!\otp\bin;!vendor_dir!\elixir\bin;!PATH!
 
 if defined LIVEBOOK_NODE set RELEASE_NODE=!LIVEBOOK_NODE!
 if defined LIVEBOOK_COOKIE set RELEASE_COOKIE=!LIVEBOOK_COOKIE!
diff --git a/rel/app/env.sh.eex b/rel/app/env.sh.eex
index 6f008612f..e0d79170b 100644
--- a/rel/app/env.sh.eex
+++ b/rel/app/env.sh.eex
@@ -5,11 +5,12 @@ fi
 export RELEASE_MODE="interactive"
 export RELEASE_DISTRIBUTION="none"
 
-export MIX_ARCHIVES="${RELEASE_ROOT}/vendor/archives"
-export MIX_REBAR3="${RELEASE_ROOT}/vendor/rebar3"
+vendor_dir="${RELEASE_ROOT}/vendor/livebook-${RELEASE_VSN}"
+export MIX_ARCHIVES="${vendor_dir}/archives"
+export MIX_REBAR3="${vendor_dir}/rebar3"
 export LIVEBOOK_SHUTDOWN_ENABLED=${LIVEBOOK_SHUTDOWN_ENABLED:-true}
 [ -z "$LIVEBOOK_PORT" ] && export LIVEBOOK_PORT=0
-export PATH="$RELEASE_ROOT/vendor/otp/erts-<%= @release.erts_version%>/bin:$RELEASE_ROOT/vendor/otp/bin:$RELEASE_ROOT/vendor/elixir/bin:$PATH"
+export PATH="${vendor_dir}/otp/erts-<%= @release.erts_version%>/bin:${vendor_dir}/otp/bin:${vendor_dir}/elixir/bin:$PATH"
 
 if [ ! -z "${LIVEBOOK_NODE}" ]; then export RELEASE_NODE=${LIVEBOOK_NODE}; fi
 if [ ! -z "${LIVEBOOK_COOKIE}" ]; then export RELEASE_COOKIE=${LIVEBOOK_COOKIE}; fi
diff --git a/rel/app/standalone.exs b/rel/app/standalone.exs
index 0a03e84bd..62e3e25b6 100644
--- a/rel/app/standalone.exs
+++ b/rel/app/standalone.exs
@@ -9,7 +9,7 @@ defmodule Standalone do
     erts_source = Path.join(:code.root_dir(), "erts-#{release.erts_version}")
     otp_bin_dir = Path.join(:code.root_dir(), "bin")
     otp_lib_dir = :code.lib_dir()
-    vendor_otp_dir = Path.join([release.path, "vendor", "otp"])
+    vendor_otp_dir = vendor_dir(release, "otp")
     File.rm_rf!(vendor_otp_dir)
     File.mkdir_p!(vendor_otp_dir)
 
@@ -74,7 +74,7 @@ defmodule Standalone do
   """
   @spec copy_elixir(Mix.Release.t(), elixir_version :: String.t()) :: Mix.Release.t()
   def copy_elixir(release, elixir_version) do
-    standalone_destination = Path.join(release.path, "vendor/elixir")
+    standalone_destination = vendor_dir(release, "elixir")
     download_elixir_at_destination(standalone_destination, elixir_version)
 
     filenames =
@@ -108,7 +108,7 @@ defmodule Standalone do
   """
   @spec copy_hex(Mix.Release.t()) :: Mix.Release.t()
   def copy_hex(release) do
-    release_archives_dir = Path.join(release.path, "vendor/archives")
+    release_archives_dir = vendor_dir(release, "archives")
     File.mkdir_p!(release_archives_dir)
 
     hex_version = Keyword.fetch!(Application.spec(:hex), :vsn)
@@ -132,7 +132,7 @@ defmodule Standalone do
       File.write!(path, binary, [:binary])
     end
 
-    destination = Path.join(release.path, "vendor/rebar3")
+    destination = vendor_dir(release, "rebar3")
     File.cp!(path, destination)
     make_executable(destination)
 
@@ -156,4 +156,8 @@ defmodule Standalone do
   defp cp_r!(source, destination) do
     File.cp_r!(source, destination, fn _, _ -> false end)
   end
+
+  defp vendor_dir(release, path) do
+    Path.join([release.path, "vendor", "livebook-#{release.version}", path])
+  end
 end