From 182661dd3d683ddd1708d453990187516823e3e6 Mon Sep 17 00:00:00 2001
From: Zach Allaun <zach.allaun@gmail.com>
Date: Mon, 25 Sep 2023 09:27:58 -0400
Subject: [PATCH] Detect version manager the same way in all scripts

`start_lexical.sh` and `port_wrapper.sh` were using different methods to
detect the version manager. `start_lexical.sh` was updated more
recently, so I standardized on that.

I also refactored the detection function slightly to echo the result
instead of setting a global variable, since it was only used in one
place and can be easily captured. This should also make it easier to
extract this function into a shared utility if we desire.

Finally, `start_lexical.sh` wasn't doing anything to start the program
in the background in non-detected version manager case. I don't fully
understand why this is necessary in the first place, but I added it for
consistency.
---
 apps/remote_control/priv/port_wrapper.sh | 18 ++++++++----------
 bin/start_lexical.sh                     | 12 +++++-------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/apps/remote_control/priv/port_wrapper.sh b/apps/remote_control/priv/port_wrapper.sh
index e17be5d91..6761d2c82 100755
--- a/apps/remote_control/priv/port_wrapper.sh
+++ b/apps/remote_control/priv/port_wrapper.sh
@@ -1,24 +1,22 @@
 #!/usr/bin/env bash
 
-set_up_version_manager() {
-    if [ -e $HOME/.asdf ] && asdf which erl -eq 0 ; then
-        VERSION_MANAGER="asdf"
-    elif [ -e $HOME/.rtx ] && rtx which erl -eq 0 ; then
-        VERSION_MANAGER="rtx"
+detect_version_manager() {
+    if command -v asdf > /dev/null && asdf which elixir > /dev/null 2>&1 ; then
+        echo "asdf"
+    elif command -v rtx > /dev/null &&  rtx which elixir > /dev/null 2>&1 ; then
+        echo "rtx"
     else
-        VERSION_MANAGER="none"
+        echo "not_detected"
     fi
 }
 
-set_up_version_manager
-
 # Start the program in the background
-case "$VERSION_MANAGER" in
+case "$(detect_version_manager)" in
     asdf)
         asdf env erl exec "$@" &
         ;;
     rtx)
-        rtx env -s bash erl exec "$@" &
+        eval "$(rtx env -s bash)"
         ;;
     *)
         exec "$@" &
diff --git a/bin/start_lexical.sh b/bin/start_lexical.sh
index 505c0de70..6975e829b 100755
--- a/bin/start_lexical.sh
+++ b/bin/start_lexical.sh
@@ -1,19 +1,17 @@
 #!/usr/bin/env bash
 
-set_up_version_manager() {
+detect_version_manager() {
     if command -v asdf > /dev/null && asdf which elixir > /dev/null 2>&1 ; then
-        VERSION_MANAGER="asdf"
+        echo "asdf"
     elif command -v rtx > /dev/null &&  rtx which elixir > /dev/null 2>&1 ; then
-        VERSION_MANAGER="rtx"
+        echo "rtx"
     else
-        VERSION_MANAGER="none"
+        echo "not_detected"
     fi
 }
 
-set_up_version_manager
-
 # Start the program in the background
-case "$VERSION_MANAGER" in
+case "$(detect_version_manager)" in
     asdf)
         asdf env erl exec "$@" &
         ;;