Skip to content

Commit 506dac8

Browse files
authored
Export GetJavaUserHome function (#345)
1 parent f12dfb4 commit 506dac8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

artifactory/commands/gradle/gradle.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ func WriteInitScript(initScript string) error {
385385
gradleHome := os.Getenv(UserHomeEnv)
386386
if gradleHome == "" {
387387
// Try Java's user.home first (fixes container issue where $HOME != user.home)
388-
if javaHome, err := getJavaUserHome(); err == nil && javaHome != "" {
388+
if javaHome, err := GetJavaUserHome(); err == nil && javaHome != "" {
389389
log.Debug("Using Java user.home for Gradle:", javaHome)
390390
gradleHome = filepath.Join(javaHome, ".gradle")
391391
} else {
@@ -407,10 +407,10 @@ func WriteInitScript(initScript string) error {
407407
return nil
408408
}
409409

410-
// getJavaUserHome queries Java for its user.home system property.
410+
// GetJavaUserHome queries Java for its user.home system property.
411411
// Gradle uses this property (not $HOME) to determine where to look for init scripts.
412412
// This fixes issues in containers where $HOME and Java's user.home can differ.
413-
func getJavaUserHome() (string, error) {
413+
func GetJavaUserHome() (string, error) {
414414
cmd := exec.Command("java", "-XshowSettings:properties", "-version")
415415
output, err := cmd.CombinedOutput()
416416
if err != nil {
@@ -420,7 +420,7 @@ func getJavaUserHome() (string, error) {
420420
}
421421

422422
// parseUserHomeFromJavaOutput extracts the user.home property from Java's -XshowSettings:properties output.
423-
// This is separated from getJavaUserHome for unit testing purposes.
423+
// This is separated from GetJavaUserHome for unit testing purposes.
424424
func parseUserHomeFromJavaOutput(output string) (string, error) {
425425
for _, line := range strings.Split(output, "\n") {
426426
if strings.Contains(line, javaUserHome) {

artifactory/commands/gradle/gradle_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ func TestParseUserHomeFromJavaOutput(t *testing.T) {
251251
// This is the fix for container environments where $HOME differs from Java's user.home.
252252
func TestWriteInitScriptUsesJavaUserHome(t *testing.T) {
253253
// Get Java's user.home - skip if Java is not available
254-
javaHome, err := getJavaUserHome()
254+
javaHome, err := GetJavaUserHome()
255255
if err != nil {
256256
t.Skip("Java not available, skipping test")
257257
}

0 commit comments

Comments
 (0)