Skip to content

Add shell fallback for JAVA_HOME detection #378

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

Open
vladd-g wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −2
Open

Add shell fallback for JAVA_HOME detection #378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 25 additions & 2 deletions doctor-plugin/src/main/java/com/osacky/doctor/DoctorPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class DoctorPlugin : Plugin<Project> {
val intervalMeasurer = IntervalMeasurer()
val pillBoxPrinter = PillBoxPrinter(target.logger)
val daemonChecker = BuildDaemonChecker(extension, createDaemonChecker(os, cliCommandExecutor), pillBoxPrinter)
val javaHomeCheck = createJavaHomeCheck(extension, pillBoxPrinter)
val javaHomeCheck = createJavaHomeCheck(extension, pillBoxPrinter, cliCommandExecutor)
val appleRosettaTranslationCheck =
AppleRosettaTranslationCheck(
os,
Expand Down Expand Up @@ -161,12 +161,35 @@ class DoctorPlugin : Plugin<Project> {
private fun createJavaHomeCheck(
extension: DoctorExtension,
pillBoxPrinter: PillBoxPrinter,
cliCommandExecutor: CliCommandExecutor,
): JavaHomeCheck {
val jvmVariables =
JvmVariables(environmentJavaHome = System.getenv(JAVA_HOME), gradleJavaHome = Jvm.current().javaHome.path)
JvmVariables(environmentJavaHome = getenv(JAVA_HOME, cliCommandExecutor), gradleJavaHome = Jvm.current().javaHome.path)
return JavaHomeCheck(jvmVariables, extension.javaHomeHandler, pillBoxPrinter)
}

private fun getenv(name: String, cliCommandExecutor: CliCommandExecutor) =
System.getenv(name) ?: cliCommandExecutor.getenv(name)

private fun CliCommandExecutor.getenv(name: String): String {
val isWindows = System.getProperty("os.name")?.contains("windows", ignoreCase = true) == true

return execute(
if (isWindows) {
arrayOf("cmd.exe", "/c", "echo %$name%")
} else {
arrayOf(
(System.getenv("SHELL") ?: "/bin/bash"),
"-c",
"source ~/.bashrc 2>/dev/null; source ~/.zshrc 2>/dev/null; echo \$$name",
)
}
)
.trim()
.takeUnless { output -> isWindows && output == "%$name%" } // in case Windows outputs with %NAME% if the value is absent
.orEmpty()
}

private fun tagFreshDaemon(
target: Project,
buildScanApi: BuildScanAdapter,
Expand Down