From c7415a62ea5617129c70ebe64e31a7eb6e419666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=C3=A4tzold?= <obel1x@web.de>
Date: Mon, 9 Mar 2026 20:14:17 +0100
Subject: [PATCH] Moved installs to source to make git and nextcloud work
 together

---
 system_setup/setup_system.conf       |  1 +
 system_setup/sync_client_software.sh | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/system_setup/setup_system.conf b/system_setup/setup_system.conf
index f20508d..29b825c 100644
--- a/system_setup/setup_system.conf
+++ b/system_setup/setup_system.conf
@@ -8,6 +8,7 @@ export SERVERFQDN_IPA=ipa.${TLDOMAIN} # Needs to be the IPA- Server
 export SERVERFQDN_NC=nextcloud.${TLDOMAIN}
 export SYSCONFIGPATH="/sys_config"
 export INSTALLDOCS="https://dokuwiki.obel1x.de/content:serverbasics"
+export CLIENTADMINGROUP="clientadmins"
 
 # Method to determine Unique Hostname / FQDN of the Client. May be replaced by your needs
 if [ "$EUID" -eq 0 ]; then
diff --git a/system_setup/sync_client_software.sh b/system_setup/sync_client_software.sh
index 736e9e5..7b6fe20 100755
--- a/system_setup/sync_client_software.sh
+++ b/system_setup/sync_client_software.sh
@@ -42,8 +42,12 @@ echo "Update or install Nextcloud client"
 /usr/bin/flatpak install -y --or-update --noninteractive flathub com.nextcloud.desktopclient.nextcloud && echo "Done Update/Install of Nextcloud."
 
 #Sync Files
-SYNCCMD="sudo -i /usr/bin/flatpak run --branch=stable --arch=x86_64 --command=nextcloudcmd com.nextcloud.desktopclient.nextcloud -h -u ${DAVTOKEN_USER} -p ${DAVTOKEN_PASS} --path ${CLIENT_SOFTWARE_SRC} ${CLIENT_SOFTWARE_DST} https://${SERVERFQDN_NC}"
+SYNCCMD="sudo -i /usr/bin/flatpak run --branch=stable --arch=x86_64 --command=nextcloudcmd com.nextcloud.desktopclient.nextcloud -h -u ${DAVTOKEN_USER} -p ${DAVTOKEN_PASS} --path ${CLIENT_SOFTWARE_SRC} ${CLIENT_SOFTWARE_DST}/source https://${SERVERFQDN_NC}"
 SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" )
+mkdir -p ${CLIENT_SOFTWARE_SRC}
+mkdir -p ${CLIENT_SOFTWARE_SRC}/source
+chown root:${CLIENTADMINGROUP} -R ${CLIENT_SOFTWARE_DST}
+chmod ug+rw,o-rwx -R ${CLIENT_SOFTWARE_DST}
 echo "Exec: ${SYNCCMD_HIDDENPW}"
 echo "Sync Client Software" > ${LOGFILE}
 echo "====================" >> ${LOGFILE}
@@ -63,8 +67,8 @@ if [[ $? -ne 0 ]]; then
     exit 1
 fi
 #Files must be owned by root
-chown root:root -R ${CLIENT_SOFTWARE_DST}
-chmod u+rw,go-rwx -R ${CLIENT_SOFTWARE_DST}
+chown root:${CLIENTADMINGROUP} -R ${CLIENT_SOFTWARE_DST}
+chmod ug+rw,o-rwx -R ${CLIENT_SOFTWARE_DST}
 if [ -f "${CLIENT_SOFTWARE_DST}/install.sh" ]; then
     chmod u+x "${CLIENT_SOFTWARE_DST}/install.sh"
 fi