Improved errorhandling of sw install

This commit is contained in:
Daniel Pätzold
2026-03-12 10:35:30 +01:00
parent 7e7b7753bb
commit b1e5752318
3 changed files with 6 additions and 2 deletions
+2
View File
@@ -64,6 +64,8 @@ if [[ $INST_RET -ne 0 ]]; then
elog_add "If you want to change this, make a FreeIPA sudoers rule for the script sync_client_software.sh with !authenticate for you and become a member." elog_add "If you want to change this, make a FreeIPA sudoers rule for the script sync_client_software.sh with !authenticate for you and become a member."
else else
elog_add "*** Error executing software sync and install, please check your output! ***" elog_add "*** Error executing software sync and install, please check your output! ***"
# TODO: This is not working due to the above Command. Redesign command to make it work
exit 1
fi fi
fi fi
+1 -2
View File
@@ -53,11 +53,10 @@ if [[ ${BREAK_ERROR} == 1 ]]; then
exit 1 exit 1
fi fi
echo "Synchronise profile"
# optional: -s = silentmodus # optional: -s = silentmodus
SYNCCMD="/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=nextcloudcmd com.nextcloud.desktopclient.nextcloud -h -u ${DAVTOKEN_USER} -p ${DAVTOKEN_PASS} --path ${REMOTE_PATH}/${profilename} ${PROFILE_PATH}/${profilename} https://${SERVERFQDN_NC}" SYNCCMD="/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=nextcloudcmd com.nextcloud.desktopclient.nextcloud -h -u ${DAVTOKEN_USER} -p ${DAVTOKEN_PASS} --path ${REMOTE_PATH}/${profilename} ${PROFILE_PATH}/${profilename} https://${SERVERFQDN_NC}"
SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" ) SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" )
echo "Exec ${1} with Profile ${profilename}: ${SYNCCMD_HIDDENPW}" echo "Synchronise ${1} with Profile ${profilename}: ${SYNCCMD_HIDDENPW}"
mkdir -p ${TEMPDIR} mkdir -p ${TEMPDIR}
echo "Mozilla Starter" > ${LOGFILE} echo "Mozilla Starter" > ${LOGFILE}
echo "===============" >> ${LOGFILE} echo "===============" >> ${LOGFILE}
+3
View File
@@ -74,4 +74,7 @@ fi
echo "Sucessfully synced." echo "Sucessfully synced."
if [ $1 == "install" ]; then if [ $1 == "install" ]; then
${CLIENT_SOFTWARE_DST}/source/install.sh ${CLIENT_SOFTWARE_DST}/source/install.sh
if [ $? -ne 0 ]; then
exit 1
fi
fi fi