diff --git a/Makefile b/Makefile
index 9b187c8..04531ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# We use Makefile for simplifying mvn command's usage.
# Since InspektorDog (shortened "insdog") is a Java-based component, its binary build and release should be done through mvn, without relying on Makefile.
-BASH:=$(shell which bash)
+SHELL:=$(shell which bash)
MVN:=source .dependencies/sdkman/bin/sdkman-init.sh && \
sdk use java "${SDK_JDK_NAME}" && \
mvn -B -Dmaven.javadoc.skip=true
diff --git a/bootstrap.sh b/bootstrap.sh
index 9224893..9c27a21 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -175,7 +175,7 @@ function compose_goenv_rc() {
export GOPATH=${_project_godir}/${_go_version}
export GOROOT=${_project_godir}/env/versions/${_go_version}
- export PATH=${_project_godir}/${_go_version}/bin:${PATH}
+ export PATH=${_project_godir}/${_go_version}/bin:"'${PATH}'"
"
}
@@ -184,6 +184,7 @@ function compose_sdk_rc() {
echo "
export SDK_JDK_NAME=${_jdk_name}
export SDK_JAVADOC_JDK_NAME=${_javadoc_jdk_name}
+ export SDKMAN_DIR=$(pwd)/.dependencies/sdkman
"
}
diff --git a/env.rc b/env.rc
index 8eb3610..283ca28 100644
--- a/env.rc
+++ b/env.rc
@@ -10,8 +10,8 @@ function abort() {
exit 1
}
-function init_for_macos() {
- basedir="$(dirname "${BASH_SOURCE[0]}")"
+function init() {
+ basedir="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"
rcdir="${basedir}/.dependencies/rc"
[[ -d "${rcdir}" ]] || abort "Please run 'bootstrap.sh', first!"
@@ -19,12 +19,23 @@ function init_for_macos() {
source "${rcdir}/sdk.rc"
source "${rcdir}/goenv.rc"
source "${rcdir}/caveats.rc"
+}
+
+function init_for_macos() {
+ init "${@}"
source "${rcdir}/.bash_profile"
}
+function init_for_linux() {
+ init "${@}"
+ source "${rcdir}/.bashrc"
+}
+
function main() {
if [[ "${OSTYPE}" == "darwin"* ]]; then
init_for_macos "${@}"
+ elif [[ "${OSTYPE}" == "linux-gnu" ]]; then
+ init_for_linux "${@}"
else
message "${OSTYPE}: no user terminal initialization step is defined for this os type. Going ahead."
fi
diff --git a/pom.xml b/pom.xml
index 258e7a8..fc9eb20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
${project.basedir}/.generated/build/gems
- 1.44.0
+ 1.49.0
4.7.6
4.8.174
2.1.3