From 219913d12b8a7689cf88a152c5989abccf686445 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 20 Feb 2022 12:52:21 +0300
Subject: [PATCH] updater: force adding user/group even if GID/UID is duplicate

---
 app/startup.sh | 1 -
 app/updater.sh | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/startup.sh b/app/startup.sh
index 898641e..f627d33 100755
--- a/app/startup.sh
+++ b/app/startup.sh
@@ -10,7 +10,6 @@ unset HTTP_PORT
 unset HTTP_HOST
 
 if ! id app >/dev/null 2>&1; then
-
 	# what if i actually need a duplicate GID/UID group?
 
 	addgroup -g $OWNER_GID app || echo app:x:$OWNER_GID:app | \
diff --git a/app/updater.sh b/app/updater.sh
index e3a5bb5..9a682b2 100755
--- a/app/updater.sh
+++ b/app/updater.sh
@@ -8,8 +8,13 @@ unset HTTP_HOST
 sleep 30
 
 if ! id app >/dev/null 2>&1; then
-	addgroup -g $OWNER_GID app
-	adduser -D -h /var/www/html -G app -u $OWNER_UID app
+	# what if i actually need a duplicate GID/UID group?
+
+	addgroup -g $OWNER_GID app || echo app:x:$OWNER_GID:app | \
+		tee -a /etc/group
+
+	adduser -D -h /var/www/html -G app -u $OWNER_UID app || \
+		echo app:x:$OWNER_UID:$OWNER_GID:Linux User,,,:/var/www/html:/bin/ash | tee -a /etc/passwd
 fi
 
 while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER; do