From ea21d5d61ba4e0210273885ff85ca01dba645ae3 Mon Sep 17 00:00:00 2001 From: Felipe Santos Date: Mon, 14 Mar 2022 15:22:56 -0300 Subject: [PATCH 1/3] Allow `~/.sdkmanrc` to overwrite `~/.sdkman/etc/config` --- src/main/bash/sdkman-config.sh | 2 +- src/main/bash/sdkman-init.sh | 5 +++++ src/main/bash/sdkman-main.sh | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/bash/sdkman-config.sh b/src/main/bash/sdkman-config.sh index 10af6ebac..08831433d 100644 --- a/src/main/bash/sdkman-config.sh +++ b/src/main/bash/sdkman-config.sh @@ -26,5 +26,5 @@ function __sdk_config() { return 1 fi - "${editor[@]}" "${SDKMAN_DIR}/etc/config" + "${editor[@]}" "${SDKMAN_DIR}/.sdkmanrc" } \ No newline at end of file diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh index 89ad27e84..4c177c874 100644 --- a/src/main/bash/sdkman-init.sh +++ b/src/main/bash/sdkman-init.sh @@ -34,6 +34,11 @@ if [ -f "${SDKMAN_DIR}/etc/config" ]; then source "${SDKMAN_DIR}/etc/config" fi +# Load the sdkman user config if it exists. +if [ -f "${HOME}/.sdkmanrc" ]; then + source "${SDKMAN_DIR}/.sdkmanrc" +fi + # infer platform function infer_platform() { local kernel diff --git a/src/main/bash/sdkman-main.sh b/src/main/bash/sdkman-main.sh index ee51b0d87..d5c6bb2b2 100644 --- a/src/main/bash/sdkman-main.sh +++ b/src/main/bash/sdkman-main.sh @@ -95,6 +95,11 @@ function sdk() { source "${SDKMAN_DIR}/etc/config" fi + # Load the sdkman user config if it exists. + if [ -f "${HOME}/.sdkmanrc" ]; then + source "${SDKMAN_DIR}/.sdkmanrc" + fi + # no command provided if [[ -z "$COMMAND" ]]; then __sdk_help From 0c20697a03e3d8da5b04dd576a9ac6377b9e6dcd Mon Sep 17 00:00:00 2001 From: Felipe Santos Date: Tue, 15 Mar 2022 14:07:33 -0300 Subject: [PATCH 2/3] Change to .sdkmanconfig --- src/main/bash/sdkman-config.sh | 2 +- src/main/bash/sdkman-init.sh | 4 ++-- src/main/bash/sdkman-main.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/bash/sdkman-config.sh b/src/main/bash/sdkman-config.sh index 08831433d..10af6ebac 100644 --- a/src/main/bash/sdkman-config.sh +++ b/src/main/bash/sdkman-config.sh @@ -26,5 +26,5 @@ function __sdk_config() { return 1 fi - "${editor[@]}" "${SDKMAN_DIR}/.sdkmanrc" + "${editor[@]}" "${SDKMAN_DIR}/etc/config" } \ No newline at end of file diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh index 4c177c874..9c51b292e 100644 --- a/src/main/bash/sdkman-init.sh +++ b/src/main/bash/sdkman-init.sh @@ -35,8 +35,8 @@ if [ -f "${SDKMAN_DIR}/etc/config" ]; then fi # Load the sdkman user config if it exists. -if [ -f "${HOME}/.sdkmanrc" ]; then - source "${SDKMAN_DIR}/.sdkmanrc" +if [ -f "${HOME}/.sdkmanconfig" ]; then + source "${HOME}/.sdkmanconfig" fi # infer platform diff --git a/src/main/bash/sdkman-main.sh b/src/main/bash/sdkman-main.sh index d5c6bb2b2..bc6d92c1e 100644 --- a/src/main/bash/sdkman-main.sh +++ b/src/main/bash/sdkman-main.sh @@ -96,8 +96,8 @@ function sdk() { fi # Load the sdkman user config if it exists. - if [ -f "${HOME}/.sdkmanrc" ]; then - source "${SDKMAN_DIR}/.sdkmanrc" + if [ -f "${HOME}/.sdkmanconfig" ]; then + source "${HOME}/.sdkmanconfig" fi # no command provided From a25768c70036c7d60c9f4a40fd8dbf9d37aaa5c9 Mon Sep 17 00:00:00 2001 From: Felipe Santos Date: Sun, 20 Mar 2022 14:09:57 -0300 Subject: [PATCH 3/3] Use XDG spec instead --- src/main/bash/sdkman-init.sh | 4 ++-- src/main/bash/sdkman-main.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh index 9c51b292e..b83a5ce78 100644 --- a/src/main/bash/sdkman-init.sh +++ b/src/main/bash/sdkman-init.sh @@ -35,8 +35,8 @@ if [ -f "${SDKMAN_DIR}/etc/config" ]; then fi # Load the sdkman user config if it exists. -if [ -f "${HOME}/.sdkmanconfig" ]; then - source "${HOME}/.sdkmanconfig" +if [ -f "${HOME}/.config/sdkman/config" ]; then + source "${HOME}/.config/sdkman/config" fi # infer platform diff --git a/src/main/bash/sdkman-main.sh b/src/main/bash/sdkman-main.sh index bc6d92c1e..23ac8634a 100644 --- a/src/main/bash/sdkman-main.sh +++ b/src/main/bash/sdkman-main.sh @@ -96,8 +96,8 @@ function sdk() { fi # Load the sdkman user config if it exists. - if [ -f "${HOME}/.sdkmanconfig" ]; then - source "${HOME}/.sdkmanconfig" + if [ -f "${HOME}/.config/sdkman/config" ]; then + source "${HOME}/.config/sdkman/config" fi # no command provided