obel1x/fedora-OEMDRV
0
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Bugs switch to /opt

Browse Source
This commit is contained in:
Daniel Pätzold
2026-03-15 13:02:37 +01:00
parent 488f04d387
commit 5a9059366f
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -1,3 +1,4 @@
.Trash*
system_setup/setup_system.conf system_setup/setup_system.conf
system_setup/setup_system.conf.bak system_setup/setup_system.conf.bak
system_setup/skel.tar.zst system_setup/skel.tar.zst
system_setup/logon_script.sh
+2
View File
@@ -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.*$' elog_add "A matching sudo rule could look like this: "'^'${SYSCONFIGPATH////'\/'}'\/system_setup\/sync_client_software\.sh.*$'
else else
elog_add "Matching Sudo rule found." 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" 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 ) #ERRTXT=$( { /usr/bin/sudo -n --preserve-env ${SYSCONFIGPATH}/system_setup/sync_client_software.sh install > >(tee -a ${LOGFILE}); } 2>&1 )
#ERR=$? #ERR=$?
system_setup/sync_client_software.sh
+2 -3
View File
@@ -29,7 +29,6 @@ fi
echo "Syncing central softwarerepository ${CLIENT_SOFTWARE_DST}" echo "Syncing central softwarerepository ${CLIENT_SOFTWARE_DST}"
# Create Directory if not existent # Create Directory if not existent
mkdir -p ${CLIENT_SOFTWARE_DST} mkdir -p ${CLIENT_SOFTWARE_DST}
mkdir -p ${CLIENT_SOFTWARE_DST}/source
#Logs for systems software-repository go to roots log files #Logs for systems software-repository go to roots log files
LOGFILE="${TEMPDIR}/${SCRIPTNAME}.log" 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." /usr/bin/flatpak install -y --or-update --noninteractive flathub com.nextcloud.desktopclient.nextcloud && echo "Done Update/Install of Nextcloud."
#Sync Files #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***}" ) SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" )
chown root:${CLIENTADMINGROUP} -R ${CLIENT_SOFTWARE_DST} chown root:${CLIENTADMINGROUP} -R ${CLIENT_SOFTWARE_DST}
chmod ug+rw,o-rwx -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 fi
echo "Sucessfully synced." echo "Sucessfully synced."
if [ $1 == "install" ]; then if [ $1 == "install" ]; then
${CLIENT_SOFTWARE_DST}/source/install.sh ${CLIENT_SOFTWARE_DST}/install.sh
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi