Skip to content

fix: Make bootstrap.sh/env.rc work on Linux platforms #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 31, 2025
+17 −5
Merged

fix: Make bootstrap.sh/env.rc work on Linux platforms #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
434bb4e
Make bootstrap.sh/env.rc work on Linux platforms.
dakusui Feb 24, 2025
d80a29f
Make bootstrap specify private SDKMAN_DIR explicitly
dakusui Feb 24, 2025
6856acf
Remove accidentally added run configurations.
dakusui Feb 25, 2025
61c7d70
Include .bashrc to source explicitly for linux platform.
dakusui Feb 25, 2025
6beda48
Bump up playwright-java version to 1.49.0.
dakusui Feb 25, 2025
e08614a
Make linux/macOS load only their specific bash config files
dakusui Mar 1, 2025
e06e978
fix: Make PATH element to homebrew absolute
dakusui Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}'"
"
}

Expand All @@ -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
"
}

Expand Down
15 changes: 13 additions & 2 deletions env.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,32 @@ 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!"

export PATH="${basedir}/.dependencies/homebrew/bin:${PATH}"
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
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<env.GEM_PATH>${project.basedir}/.generated/build/gems</env.GEM_PATH>
<!-- END: project settings -->
<!-- BEGIN: compilation dependencies -->
<playwright.version>1.44.0</playwright.version>
<playwright.version>1.49.0</playwright.version>
<picocli.version>4.7.6</picocli.version>
<classgraph.version>4.8.174</classgraph.version>
<valid8j.version>2.1.3</valid8j.version>
Expand Down
Loading