Tidy output sync_client_software.sh

This commit is contained in:
2026-04-25 14:10:14 +02:00
parent 4947599bb3
commit 7e33a96231
+1 -7
View File
@@ -30,7 +30,6 @@ chmod ug+rwX,o=rX -R ${SYSCONFIGPATH}
#Do an upgrade of the Base package if its configured and if there are changes #Do an upgrade of the Base package if its configured and if there are changes
if [[ ! -z "${UPGRADEURL}" ]]; then if [[ ! -z "${UPGRADEURL}" ]]; then
echo "===================="
echo "Checking for Upgrades on ${UPGRADEURL} and Branch ${UPGRADEBRANCH}" echo "Checking for Upgrades on ${UPGRADEURL} and Branch ${UPGRADEBRANCH}"
REMOTEURL=$( git config --get remote.origin.url ) REMOTEURL=$( git config --get remote.origin.url )
echo "Remote git URL is ${REMOTEURL}" echo "Remote git URL is ${REMOTEURL}"
@@ -55,13 +54,11 @@ fi
# At first, sync central configs if they are configured to be synced # At first, sync central configs if they are configured to be synced
if [[ ! -z "${DISTCONFIGPATH_SRC}" ]]; then if [[ ! -z "${DISTCONFIGPATH_SRC}" ]]; then
echo "===================="
echo "Synced config path was found, doing remote sync." echo "Synced config path was found, doing remote sync."
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 ${DISTCONFIGPATH_SRC} ${DISTCONFIGPATH} 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 ${DISTCONFIGPATH_SRC} ${DISTCONFIGPATH} https://${SERVERFQDN_NC}"
SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" ) SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" )
echo "Exec: ${SYNCCMD_HIDDENPW}" echo "Exec: ${SYNCCMD_HIDDENPW}"
echo "Sync Configuration" echo "Sync Configuration"
echo ""
${SYNCCMD} >${TEMPDIR}/synccmd_last.log 2>&1 ${SYNCCMD} >${TEMPDIR}/synccmd_last.log 2>&1
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "Error in sync:" echo "Error in sync:"
@@ -77,7 +74,6 @@ if [[ ! -z "${DISTCONFIGPATH_SRC}" ]]; then
echo "" echo ""
fi fi
#Check if Repository is defined #Check if Repository is defined
echo "===================="
if [ "${CLIENT_SOFTWARE_DST}." == "." ]; then if [ "${CLIENT_SOFTWARE_DST}." == "." ]; then
echo "No central softwarerepository defined (CLIENT_SOFTWARE_DST). Skipping sync." echo "No central softwarerepository defined (CLIENT_SOFTWARE_DST). Skipping sync."
else else
@@ -90,8 +86,6 @@ else
SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" ) SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" )
echo "Exec: ${SYNCCMD_HIDDENPW}" echo "Exec: ${SYNCCMD_HIDDENPW}"
echo "Sync Client Software" echo "Sync Client Software"
echo "===================="
echo ""
${SYNCCMD} >${TEMPDIR}/synccmd_last.log 2>&1 ${SYNCCMD} >${TEMPDIR}/synccmd_last.log 2>&1
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "Error in sync:" echo "Error in sync:"
@@ -121,5 +115,5 @@ else
exit 1 exit 1
fi fi
fi fi
echo ""
fi fi
echo ""