From e7b51ec84e303a5786090c0089b7062fb3e80f9e Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 4 Sep 2024 17:45:04 +0200
Subject: [PATCH] Simplify rootless-test

---
 build.sh    | 12 +++++-------
 download.sh | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/build.sh b/build.sh
index 0e38707..277a4fa 100755
--- a/build.sh
+++ b/build.sh
@@ -10,13 +10,11 @@ for addin in ${ADDINS[*]}; do
     source "addins/${addin}.sh"
 done
 
-TESTFILE="uidtestfile"
-rm -f "$TESTFILE"
-docker run --rm -v "$PWD:/uidtestdir" "$IMAGE" touch "/uidtestdir/$TESTFILE"
-DOCKERUID="$(stat -c "%u" "$TESTFILE")"
-rm -f "$TESTFILE"
-[[ "$DOCKERUID" != "$(id -u)" ]] && UIDARGS=( -u "$(id -u):$(id -g)" ) || UIDARGS=()
-unset TESTFILE
+if docker info -f "{{println .SecurityOptions}}" | grep rootless >/dev/null 2>&1; then
+    UIDARGS=()
+else
+    UIDARGS=( -u "$(id -u):$(id -g)" )
+fi
 
 rm -rf ffbuild
 mkdir ffbuild
diff --git a/download.sh b/download.sh
index da842cb..5db1b49 100755
--- a/download.sh
+++ b/download.sh
@@ -3,13 +3,11 @@ set -xe
 cd "$(dirname "$0")"
 source util/vars.sh dl only
 
-TESTFILE="uidtestfile"
-rm -f "$TESTFILE"
-docker run --rm -v "$PWD:/uidtestdir" "${REGISTRY}/${REPO}/base:latest" touch "/uidtestdir/$TESTFILE"
-DOCKERUID="$(stat -c "%u" "$TESTFILE")"
-rm -f "$TESTFILE"
-[[ "$DOCKERUID" != "$(id -u)" ]] && UIDARGS=( -u "$(id -u):$(id -g)" ) || UIDARGS=()
-unset TESTFILE
+if docker info -f "{{println .SecurityOptions}}" | grep rootless >/dev/null 2>&1; then
+    UIDARGS=()
+else
+    UIDARGS=( -u "$(id -u):$(id -g)" )
+fi
 
 [[ -t 1 ]] && TTY_ARG="-t" || TTY_ARG=""