From 1e07df031b4fb2abb079b3a8556ca9e5d13982bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonatan=20K=C5=82osko?= <jonatanklosko@gmail.com>
Date: Fri, 31 Jan 2025 01:19:38 +0700
Subject: [PATCH 1/2] Do not override RELEASE_DISTRIBUTION in release to allow
 rpc

---
 rel/app/env.bat.eex    | 2 +-
 rel/app/env.sh.eex     | 2 +-
 rel/server/env.bat.eex | 2 +-
 rel/server/env.sh.eex  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rel/app/env.bat.eex b/rel/app/env.bat.eex
index a5559fc236f..663496d6491 100644
--- a/rel/app/env.bat.eex
+++ b/rel/app/env.bat.eex
@@ -3,7 +3,7 @@ if exist "!USERPROFILE!\.livebookdesktop.bat" (
 )
 
 set RELEASE_MODE=interactive
-set RELEASE_DISTRIBUTION=none
+if not defined RELEASE_DISTRIBUTION set set RELEASE_DISTRIBUTION=none
 
 set vendor_dir=!RELEASE_ROOT!\vendor\livebook-!RELEASE_VSN!
 set MIX_ARCHIVES=!vendor_dir!\archives
diff --git a/rel/app/env.sh.eex b/rel/app/env.sh.eex
index 6f8619d8b30..c1edeceef0d 100644
--- a/rel/app/env.sh.eex
+++ b/rel/app/env.sh.eex
@@ -3,7 +3,7 @@ if [ -f "$HOME/.livebookdesktop.sh" ]; then
 fi
 
 export RELEASE_MODE="interactive"
-export RELEASE_DISTRIBUTION="none"
+if [ -z "${RELEASE_DISTRIBUTION}" ]; then export RELEASE_DISTRIBUTION="none"; fi
 
 vendor_dir="${RELEASE_ROOT}/vendor/livebook-${RELEASE_VSN}"
 export MIX_ARCHIVES="${vendor_dir}/archives"
diff --git a/rel/server/env.bat.eex b/rel/server/env.bat.eex
index 56501aace3a..0d427f005a7 100644
--- a/rel/server/env.bat.eex
+++ b/rel/server/env.bat.eex
@@ -3,7 +3,7 @@ if exist "!RELEASE_ROOT!\user\env.bat" (
 )
 
 set RELEASE_MODE=interactive
-set RELEASE_DISTRIBUTION=none
+if not defined RELEASE_DISTRIBUTION set set RELEASE_DISTRIBUTION=none
 
 if defined LIVEBOOK_NODE set RELEASE_NODE=!LIVEBOOK_NODE!
 if defined LIVEBOOK_COOKIE set RELEASE_COOKIE=!LIVEBOOK_COOKIE!
diff --git a/rel/server/env.sh.eex b/rel/server/env.sh.eex
index 2ab9e1e8796..434612a52ce 100644
--- a/rel/server/env.sh.eex
+++ b/rel/server/env.sh.eex
@@ -19,7 +19,7 @@ if [ -f "${RELEASE_ROOT}/user/env.sh" ]; then
 fi
 
 export RELEASE_MODE="interactive"
-export RELEASE_DISTRIBUTION="none"
+if [ -z "${RELEASE_DISTRIBUTION}" ]; then export RELEASE_DISTRIBUTION="none"; fi
 
 # Mirror these values, so that it is easier to use "bin/release rpc",
 # though it still requires setting RELEASE_DISTRIBUTION=name

From e2d4463c304938395e802632afe3b000b6cee8d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonatan=20K=C5=82osko?= <jonatanklosko@gmail.com>
Date: Thu, 30 Jan 2025 19:27:33 +0100
Subject: [PATCH 2/2] Apply suggestions from code review

---
 rel/app/env.bat.eex    | 2 +-
 rel/server/env.bat.eex | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rel/app/env.bat.eex b/rel/app/env.bat.eex
index 663496d6491..ac469bd36a0 100644
--- a/rel/app/env.bat.eex
+++ b/rel/app/env.bat.eex
@@ -3,7 +3,7 @@ if exist "!USERPROFILE!\.livebookdesktop.bat" (
 )
 
 set RELEASE_MODE=interactive
-if not defined RELEASE_DISTRIBUTION set set RELEASE_DISTRIBUTION=none
+if not defined RELEASE_DISTRIBUTION set RELEASE_DISTRIBUTION=none
 
 set vendor_dir=!RELEASE_ROOT!\vendor\livebook-!RELEASE_VSN!
 set MIX_ARCHIVES=!vendor_dir!\archives
diff --git a/rel/server/env.bat.eex b/rel/server/env.bat.eex
index 0d427f005a7..db338880842 100644
--- a/rel/server/env.bat.eex
+++ b/rel/server/env.bat.eex
@@ -3,7 +3,7 @@ if exist "!RELEASE_ROOT!\user\env.bat" (
 )
 
 set RELEASE_MODE=interactive
-if not defined RELEASE_DISTRIBUTION set set RELEASE_DISTRIBUTION=none
+if not defined RELEASE_DISTRIBUTION set RELEASE_DISTRIBUTION=none
 
 if defined LIVEBOOK_NODE set RELEASE_NODE=!LIVEBOOK_NODE!
 if defined LIVEBOOK_COOKIE set RELEASE_COOKIE=!LIVEBOOK_COOKIE!