From cff381f7ec5b4f64db3d301bc2c3af01d6353891 Mon Sep 17 00:00:00 2001
From: Florian Cramer <florian.cramer.112@gmail.com>
Date: Mon, 13 Mar 2023 08:22:57 +0100
Subject: [PATCH] gradle: Only set GRADLE_USER_HOME if it had not been set
 before (#4512) (#4530)

---
 bucket/gradle-bin.json | 12 +++++++++---
 bucket/gradle.json     | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/bucket/gradle-bin.json b/bucket/gradle-bin.json
index cf6ce3ee7d..f082d9724b 100644
--- a/bucket/gradle-bin.json
+++ b/bucket/gradle-bin.json
@@ -9,9 +9,15 @@
     "url": "https://services.gradle.org/distributions/gradle-8.0.2-bin.zip",
     "hash": "ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7",
     "extract_dir": "gradle-8.0.2",
-    "env_set": {
-        "GRADLE_USER_HOME": "$dir\\.gradle"
-    },
+    "post_install": [
+        "$current_env = env GRADLE_USER_HOME $global",
+        "If ($null -eq $current_env) {",
+        "    $path = \"$dir\\.gradle\"",
+        "    env GRADLE_USER_HOME $global $path",
+        "    $Env:GRADLE_USER_HOME = $path",
+        "    Write-Host \"Environment variable 'GRADLE_USER_HOME' set to '$path'\"",
+        "}"
+    ],
     "persist": ".gradle",
     "bin": "bin\\gradle.bat",
     "checkver": {
diff --git a/bucket/gradle.json b/bucket/gradle.json
index 93191956d5..0162b96cbe 100644
--- a/bucket/gradle.json
+++ b/bucket/gradle.json
@@ -9,9 +9,15 @@
     "url": "https://services.gradle.org/distributions/gradle-8.0.2-all.zip",
     "hash": "47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da",
     "extract_dir": "gradle-8.0.2",
-    "env_set": {
-        "GRADLE_USER_HOME": "$dir\\.gradle"
-    },
+    "post_install": [
+        "$current_env = env GRADLE_USER_HOME $global",
+        "If ($null -eq $current_env) {",
+        "    $path = \"$dir\\.gradle\"",
+        "    env GRADLE_USER_HOME $global $path",
+        "    $Env:GRADLE_USER_HOME = $path",
+        "    Write-Host \"Environment variable 'GRADLE_USER_HOME' set to '$path'\"",
+        "}"
+    ],
     "persist": ".gradle",
     "bin": "bin\\gradle.bat",
     "checkver": {