From af5fcc1db8e5829bc52698c2117246134e6bd748 Mon Sep 17 00:00:00 2001
From: Trenton H <797416+stumpylog@users.noreply.github.com>
Date: Thu, 10 Apr 2025 09:27:56 -0700
Subject: [PATCH] Prefers the long options to commands

---
 docker/rootfs/etc/s6-overlay/s6-rc.d/init-folders/run | 4 ++--
 docker/rootfs/etc/s6-overlay/s6-rc.d/init-start/run   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/init-folders/run b/docker/rootfs/etc/s6-overlay/s6-rc.d/init-folders/run
index 6ee3b8014..9f7d58212 100755
--- a/docker/rootfs/etc/s6-overlay/s6-rc.d/init-folders/run
+++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/init-folders/run
@@ -28,8 +28,8 @@ declare -r extra_dirs=(
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
 	# Non-root mode: Create directories as current user, warn about permission issues
 	echo "${log_prefix} Running in non-root mode, checking directories"
-	current_uid=$(id -u)
-	current_gid=$(id -g)
+	current_uid=$(id --user)
+	current_gid=$(id --group)
 
 	for dir in "${extra_dirs[@]}"; do
 		if [[ ! -d "${dir}" ]]; then
diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/init-start/run b/docker/rootfs/etc/s6-overlay/s6-rc.d/init-start/run
index 2c06a8fb5..2bc7648d9 100755
--- a/docker/rootfs/etc/s6-overlay/s6-rc.d/init-start/run
+++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/init-start/run
@@ -11,9 +11,9 @@ printf "/usr/src/paperless/src" > /var/run/s6/container_environment/PAPERLESS_SR
 echo $(date +%s) > /var/run/s6/container_environment/PAPERLESS_START_TIME_S
 
 # Check if we're starting as a non-root user
-if [ "$(id -u)" != "0" ]; then
+if [ "$(id --user)" != "0" ]; then
 	printf "true" > /var/run/s6/container_environment/USER_IS_NON_ROOT
-	echo "${log_prefix}  paperless-ngx docker container running under a user ($(id -u):$(id -g))"
+	echo "${log_prefix}  paperless-ngx docker container running under a user ($(id --user):$(id --group))"
 else
 	printf "/usr/src/paperless" > /var/run/s6/container_environment/HOME
 	echo "${log_prefix}  paperless-ngx docker container starting init as root"