diff --git a/priv/static/Linux.sh b/priv/static/Linux.sh index 2036896b..ecd58276 100755 --- a/priv/static/Linux.sh +++ b/priv/static/Linux.sh @@ -80,18 +80,15 @@ function install() { ;; "mise") curl https://mise.run | sh - echo "eval \"\$(mise activate $current_shell)\"" >>$config_file - eval "$(mise activate $current_shell)" + mise activate $current_shell --shims ;; "Erlang") sudo apt-get update sudo apt-get -y install build-essential autoconf m4 libncurses5-dev libwxgtk3.0-gtk3-dev libwxgtk-webview3.0-gtk3-dev libgl1-mesa-dev libglu1-mesa-dev libpng-dev libssh-dev unixodbc-dev xsltproc fop libxml2-utils libncurses-dev openjdk-11-jdk echo 'KERL_CONFIGURE_OPTIONS="--without-javac"' >>~/.kerlrc - mise install erlang@$erlang_version mise use -g erlang@$erlang_version ;; "Elixir") - mise install elixir@$elixir_version mise use -g elixir@$elixir_version ;; "Phoenix") @@ -101,7 +98,6 @@ function install() { "PostgreSQL") sudo apt-get update sudo apt-get -y install linux-headers-generic build-essential libssl-dev libreadline-dev zlib1g-dev libcurl4-openssl-dev uuid-dev icu-devtools - mise install postgres@$postgres_version mise use -g postgres@$postgres_version postgres_bin_path="$HOME/.local/share/mise/installs/postgres/$postgres_version/bin" export PATH="$postgres_bin_path:$PATH" diff --git a/priv/static/macOS.sh b/priv/static/macOS.sh index 6afdf1d4..2e103448 100755 --- a/priv/static/macOS.sh +++ b/priv/static/macOS.sh @@ -80,17 +80,14 @@ function install() { ;; "mise") curl https://mise.run | sh - echo 'eval "\$(mise activate '$current_shell')"' >>$config_file - eval "$(mise activate $current_shell)" + mise activate $current_shell --shims ;; "Erlang") brew install autoconf openssl@1.1 wxwidgets libxslt fop echo 'KERL_CONFIGURE_OPTIONS="--without-javac" --with-ssl=$(brew --prefix openssl@1.1)"' >>~/.kerlrc - mise install erlang@$erlang_version mise use -g erlang@$erlang_version ;; "Elixir") - mise install elixir@$elixir_version mise use -g elixir@$elixir_version ;; "Phoenix") @@ -99,7 +96,6 @@ function install() { ;; "PostgreSQL") brew install gcc readline zlib curl ossp-uuid - mise install postgres@$postgres_version mise use -g postgres@$postgres_version postgres_bin_path="$HOME/.local/share/mise/installs/postgres/$postgres_version/bin" export PATH="$postgres_bin_path:$PATH"