From 9bb3774df4fe08c1c04702a23a2f78e9b729b3a3 Mon Sep 17 00:00:00 2001 From: Alexander Yastrebov Date: Thu, 11 Jan 2024 01:50:45 +0100 Subject: [PATCH] Support set -u in parent script Do not fail when parent script has `set -u` option. See * https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html * https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html * http://mywiki.wooledge.org/BashFAQ/112 Fixes #597 --- src/main/bash/sdkman-init.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh index 7e8e34349..b73d76903 100644 --- a/src/main/bash/sdkman-init.sh +++ b/src/main/bash/sdkman-init.sh @@ -58,9 +58,9 @@ esac zsh_shell=false bash_shell=false -if [[ -n "$ZSH_VERSION" ]]; then +if [[ -n "${ZSH_VERSION:-}" ]]; then zsh_shell=true -elif [[ -n "$BASH_VERSION" ]]; then +elif [[ -n "${BASH_VERSION:-}" ]]; then bash_shell=true fi @@ -166,7 +166,7 @@ if [[ "$sdkman_auto_env" == "true" ]]; then export SDKMAN_OLD_PWD="$PWD" } - + trimmed_prompt_command="${PROMPT_COMMAND%"${PROMPT_COMMAND##*[![:space:]]}"}" [[ -z "$trimmed_prompt_command" ]] && PROMPT_COMMAND="sdkman_auto_env" || PROMPT_COMMAND="${trimmed_prompt_command%\;};sdkman_auto_env" fi