From 5a9059366fb868f8d48e6b0c8cc9a7129f1afcec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=C3=A4tzold?= <obel1x@web.de>
Date: Sun, 15 Mar 2026 13:02:37 +0100
Subject: [PATCH] Bugs switch to /opt

---
 .gitignore                           | 1 +
 system_setup/logon_script.sh         | 2 ++
 system_setup/sync_client_software.sh | 5 ++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f6f52e4..8dedf1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.Trash*
 system_setup/setup_system.conf
 system_setup/setup_system.conf.bak
 system_setup/skel.tar.zst
diff --git a/system_setup/logon_script.sh b/system_setup/logon_script.sh
index 944d9ec..1e9e988 100755
--- a/system_setup/logon_script.sh
+++ b/system_setup/logon_script.sh
@@ -71,6 +71,8 @@ if [[ $RETNO -ne 0 ]]; then
     elog_add "A matching sudo rule could look like this: "'^'${SYSCONFIGPATH////'\/'}'\/system_setup\/sync_client_software\.sh.*$'
 else
     elog_add "Matching Sudo rule found."
+    elog_add ""
+    elog_add "Running client software install..."
     elog_add_command "/usr/bin/sudo -n --preserve-env ${SYSCONFIGPATH}/system_setup/sync_client_software.sh install"
     #ERRTXT=$( { /usr/bin/sudo -n --preserve-env ${SYSCONFIGPATH}/system_setup/sync_client_software.sh install > >(tee -a ${LOGFILE}); } 2>&1 )
     #ERR=$?
diff --git a/system_setup/sync_client_software.sh b/system_setup/sync_client_software.sh
index 15e8867..371a56a 100755
--- a/system_setup/sync_client_software.sh
+++ b/system_setup/sync_client_software.sh
@@ -29,7 +29,6 @@ fi
 echo "Syncing central softwarerepository ${CLIENT_SOFTWARE_DST}"
 # Create Directory if not existent
 mkdir -p ${CLIENT_SOFTWARE_DST}
-mkdir -p ${CLIENT_SOFTWARE_DST}/source
 
 #Logs for systems software-repository go to roots log files
 LOGFILE="${TEMPDIR}/${SCRIPTNAME}.log"
@@ -41,7 +40,7 @@ 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}/source 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} https://${SERVERFQDN_NC}"
 SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" )
 chown root:${CLIENTADMINGROUP} -R ${CLIENT_SOFTWARE_DST}
 chmod ug+rw,o-rwx -R ${CLIENT_SOFTWARE_DST}
@@ -73,7 +72,7 @@ if [ -f "${CLIENT_SOFTWARE_DST}/install.sh" ]; then
 fi
 echo "Sucessfully synced."
 if [ $1 == "install" ]; then
-    ${CLIENT_SOFTWARE_DST}/source/install.sh
+    ${CLIENT_SOFTWARE_DST}/install.sh
     if [ $? -ne 0 ]; then
         exit 1
     fi