From 38d0ebf659e2c698f79727b4433006020962f81a Mon Sep 17 00:00:00 2001
From: m8in <m8in@gmx.de>
Date: Wed, 7 Oct 2026 23:43:02 +0200
Subject: [PATCH] added case where group has user as member already

---
 core/defineAuthorizedKeysOfUser.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/defineAuthorizedKeysOfUser.sh b/core/defineAuthorizedKeysOfUser.sh
index 03f5553..62b5d70 100755
--- a/core/defineAuthorizedKeysOfUser.sh
+++ b/core/defineAuthorizedKeysOfUser.sh
@@ -77,7 +77,13 @@ function ensureGroupMembership() {
         && echo "  - '${_USER}'" \
         && return 1
 
-    ! getent group | cut -d: -f1 | grep -qF "${_SSH_GROUP}" \
+    id -nG "${_USER}" | grep -qF "${_SSH_GROUP}" \
+        && echo "SUCCESS: Group exists and user is member already:  ("$(readlink -f ${0})")" \
+        && echo "  - Group: '${_SSH_GROUP}'" \
+        && echo "  - User:  '${_USER}'" \
+        && return 0
+
+    ! getent group "${_SSH_GROUP}" &> /dev/null \
         && addgroup --system --quiet "${_SSH_GROUP}" \
         && adduser --quiet "${_USER}" "${_SSH_GROUP}" \
         && echo "SUCCESS: Group was created and user was added:     ("$(readlink -f ${0})")" \
@@ -86,7 +92,7 @@ function ensureGroupMembership() {
         && return 0
 
     # Ensure the group exists then add user
-    getent group | cut -d: -f1 | grep -qF "${_SSH_GROUP}" \
+    getent group "${_SSH_GROUP}" &> /dev/null \
         && adduser --quiet "${_USER}" "${_SSH_GROUP}" \
         && echo "SUCCESS: Group already exists and user was added:  ("$(readlink -f ${0})")" \
         && echo "  - Group: '${_SSH_GROUP}'" \