diff --git a/priv/static/Linux.sh b/priv/static/Linux.sh index e8dce7ec..d6c0cc4d 100755 --- 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 index 0bd7235a..f4352f66 100644 --- 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