Try again

optimumBA · Sep 18, 2024 · 904a772 · 904a772
1 parent aee480c
commit 904a772
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/priv/static/Linux.sh b/priv/static/Linux.sh
@@ -85,18 +85,18 @@ function install() {
         case $current_shell in
         "bash" | "rbash")
             echo "eval \"\$(~/.local/bin/mise activate bash)\"" >>$config_file
+            eval "$(~/.local/bin/mise hook-env -s bash)"
             ;;
         "zsh")
             echo "eval \"\$(~/.local/bin/mise activate zsh)\"" >>$config_file
+            eval "$(~/.local/bin/mise hook-env -s zsh)"
             ;;
         *)
             echo "Unsupported shell: $current_shell"
             exit 1
             ;;
         esac
 
-        eval "$(~/.local/bin/mise hook-env)"
-
         echo "--- Debug $config_file ---"
         cat $config_file
         echo "--- End debug $config_file ---"

diff --git a/priv/static/macOS.sh b/priv/static/macOS.sh
@@ -93,18 +93,18 @@ function install() {
         case $current_shell in
         "bash" | "rbash")
             echo "eval \"\$(~/.local/bin/mise activate bash)\"" >>$config_file
+            eval "$(~/.local/bin/mise hook-env -s bash)"
             ;;
         "zsh")
             echo "eval \"\$(~/.local/bin/mise activate zsh)\"" >>$config_file
+            eval "$(~/.local/bin/mise hook-env -s zsh)"
             ;;
         *)
             echo "Unsupported shell: $current_shell"
             exit 1
             ;;
         esac
 
-        eval "$(~/.local/bin/mise hook-env)"
-
         echo "--- Debug $config_file ---"
         cat $config_file
         echo "--- End debug $config_file ---"

diff --git a/test/scripts/Makefile b/test/scripts/Makefile
@@ -4,7 +4,12 @@ SHELL := $(shell echo $$SHELL)
 .SHELLFLAGS := -eu -c
 
 serve:
-	eval "$(~/.local/bin/mise hook-env)"
+	@if [[ "$$SHELL" == *"bash"* ]]; then \
+		eval "$$(~/.local/bin/mise hook-env -s bash)"; \
+	elif [[ "$$SHELL" == *"zsh"* ]]; then \
+		eval "$$(~/.local/bin/mise hook-env -s zsh)"; \
+	fi
+
 	initdb -D ~/pgdata -U postgres
 	pg_ctl start -D ~/pgdata
 	mix phx.new --no-install phx_tools_test