From 03e0518f6fb05f052dbf09c798840c18ba96f4f9 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Tue, 4 Mar 2025 14:59:59 +0100 Subject: [PATCH] Do not run expensive env initializations for non-interactive shells --- .zshenv | 1 + env/50_rust.zsh | 2 +- env/50_scala.zsh | 9 +++++++++ env/90_podman-socket.zsh | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 120000 .zshenv diff --git a/.zshenv b/.zshenv new file mode 120000 index 0000000..65979f5 --- /dev/null +++ b/.zshenv @@ -0,0 +1 @@ +zshenv \ No newline at end of file diff --git a/env/50_rust.zsh b/env/50_rust.zsh index ddb51a8..f16266e 100644 --- a/env/50_rust.zsh +++ b/env/50_rust.zsh @@ -1,6 +1,6 @@ export RUSTUP_HOME="${XDG_DATA_HOME}/rustup" export CARGO_HOME="${XDG_DATA_HOME}/cargo" export PATH="${CARGO_HOME}/bin:${PATH}" -if which rustup &>/dev/null && [[ -n $(rustup show active-toolchain) ]]; then +if [[ $- == *i* ]] && which rustup &>/dev/null && [[ -n $(rustup show active-toolchain) ]]; then export RUST_SRC_PATH=$(rustup run stable rustc --print sysroot)/lib/rustlib/src/rust/src fi diff --git a/env/50_scala.zsh b/env/50_scala.zsh index 5fbf3e5..afd561b 100644 --- a/env/50_scala.zsh +++ b/env/50_scala.zsh @@ -1 +1,10 @@ +======= +[[ $- == *i* ]] || return 0 + +if command -v java &> /dev/null && java -version 2>&1 | grep -q GraalVM; then + export SBT_OPTS="-Xmx10G" +else + export SBT_OPTS="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=10G -Xmx10G" +fi +>>>>>>> 4f34586 (Do not run expensive env initializations for non-interactive shells) export SBT_OPTS="-Xmx10G" diff --git a/env/90_podman-socket.zsh b/env/90_podman-socket.zsh index 79035dd..fb84b9b 100644 --- a/env/90_podman-socket.zsh +++ b/env/90_podman-socket.zsh @@ -1,3 +1,5 @@ +[[ $- == *i* ]] || return 0 + if command -v podman &>/dev/null; then export DOCKER_SOCKET=$(podman system info -f '{{.Host.RemoteSocket.Path}}') export DOCKER_HOST=unix://$DOCKER_SOCKET