Try again

optimumBA · Sep 18, 2024 · 7ca02b9 · 7ca02b9
1 parent d447270
commit 7ca02b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/priv/static/Linux.sh b/priv/static/Linux.sh
@@ -86,16 +86,17 @@ function install() {
         "bash" | "rbash")
             echo "eval \"\$(~/.local/bin/mise activate bash)\"" >>$config_file
             echo "eval \"\$(~/.local/bin/mise hook-env -s bash)\"" >>$config_file
+            eval "$(~/.local/bin/mise activate bash)"
+            eval "$(~/.local/bin/mise hook-env -s bash)"
             ;;
         "zsh")
             echo "eval \"\$(~/.local/bin/mise activate zsh)\"" >>$config_file
             echo "eval \"\$(~/.local/bin/mise hook-env -s zsh)\"" >>$config_file
+            eval "$(~/.local/bin/mise activate zsh)"
+            eval "$(~/.local/bin/mise hook-env -s zsh)"
             ;;
         esac
 
-        cat $config_file
-        source $config_file
-
         mise doctor
         ;;
     "Phoenix")

diff --git a/test/scripts/Makefile b/test/scripts/Makefile
@@ -7,8 +7,15 @@ serve:
 	rm -f .mise.toml
 	rm -f .tool-versions
 
-	eval "$(mise env -s bash)"
-	# PATH="~/.local/share/mise/shims:$$PATH"
+	@if [[ "$$SHELL" == *"bash"* ]]; then \
+		echo "bash"
+		eval "$$(~/.local/bin/mise activate bash)"; \
+		eval "$$(~/.local/bin/mise hook-env -s bash)"; \
+	elif [[ "$$SHELL" == *"zsh"* ]]; then \
+		echo "zsh"
+		eval "$$(~/.local/bin/mise activate zsh)"; \
+		eval "$$(~/.local/bin/mise hook-env -s zsh)"; \
+	fi
 
 	# initdb -D ~/pgdata -U postgres
 	# pg_ctl start -D ~/pgdata