From e0891e9fdef9b4bc6db619474a1d21f79de6a7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <remi@godotengine.org>
Date: Thu, 7 Nov 2024 22:36:18 +0100
Subject: [PATCH] Adapt build scripts to run with passwordless sudo podman

---
 build-release.sh | 3 +--
 build.sh         | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build-release.sh b/build-release.sh
index bb61150..a78f433 100755
--- a/build-release.sh
+++ b/build-release.sh
@@ -115,8 +115,7 @@ publish_maven_library() {
   if [ $can_publish_maven == 0 ]; then
     return
   fi
-  # FIXME: Might be worth reworking the script to make it all sudo-safe and use appropriate users throughout.
-  sudo sh build-android/upload-mavencentral.sh
+  sh build-android/upload-mavencentral.sh
 }
 
 godot_version=""
diff --git a/build.sh b/build.sh
index ef0e1f3..7ec6a66 100755
--- a/build.sh
+++ b/build.sh
@@ -224,7 +224,7 @@ mkdir -p ${basedir}/out
 mkdir -p ${basedir}/out/logs
 mkdir -p ${basedir}/mono-glue
 
-export podman_run="${podman} run -it --rm --env BUILD_NAME --env GODOT_VERSION_STATUS --env NUM_CORES --env CLASSICAL=${build_classical} --env MONO=${build_mono} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
+export podman_run="${podman} run -it --rm --env BUILD_NAME=${BUILD_NAME} --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} --env NUM_CORES=${NUM_CORES} --env CLASSICAL=${build_classical} --env MONO=${build_mono} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
 export img_version=$IMAGE_VERSION
 
 mkdir -p ${basedir}/mono-glue
@@ -248,6 +248,10 @@ ${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:
 mkdir -p ${basedir}/out/ios
 ${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out localhost/godot-ios:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios
 
+uid=$(id -un)
+gid=$(id -gn)
 if [ ! -z "$SUDO_UID" ]; then
-  chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
+  uid="${SUDO_UID}"
+  gid="${SUDO_GID}"
 fi
+chown -R -f $uid:$gid ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz