diff --git a/system_setup/sync_client_software.sh b/system_setup/sync_client_software.sh index 8e7df4f..731a31d 100755 --- a/system_setup/sync_client_software.sh +++ b/system_setup/sync_client_software.sh @@ -15,8 +15,8 @@ fi #Check Token if [ "${DAVTOKEN_USER}." == "." ]; then echo "Error: Script cannot be executed standalone, must be run with a matching sudo rule and needs a prereserved environement from logon-script." - elog_add "A matching sudo rule could look like this: "'^'${SYSCONFIGPATH////'\/'}'\/system_setup\/sync_client_software\.sh.*$' - elog_add "Hint: the rule must contain the !authenticate and setenv option to work." + echo "A matching sudo rule could look like this: "'^'${SYSCONFIGPATH////'\/'}'\/system_setup\/sync_client_software\.sh.*$' + echo "Hint: the rule must contain the !authenticate and setenv option to work." echo "Press any key to continue" && read -n 1 -s -r && exit 1 fi @@ -26,15 +26,6 @@ if [ "${CLIENT_SOFTWARE_DST}." == "." ]; then exit 0 fi -echo "Syncing central softwarerepository ${CLIENT_SOFTWARE_DST}" -# Create Directory if not existent -mkdir -p ${CLIENT_SOFTWARE_DST} - -#Logs for systems software-repository go to roots log files -LOGFILE="${TEMPDIR}/${SCRIPTNAME}.log" -echo "Logging to File ${LOGFILE}" -mkdir -p ${TEMPDIR} - #Install or update Nextcloud com.nextcloud.desktopclient.nextcloud echo "Update or install Nextcloud client" /usr/bin/flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo @@ -45,20 +36,18 @@ chown root:${CLIENTADMINGROUP} -R ${SYSCONFIGPATH} chmod ug+rwX,o=rX -R ${SYSCONFIGPATH} # At first, sync central configs if they are configured to be synced if [[ ! -z "${DISTCONFIGPATH_SRC}" ]]; then + 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_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" ) echo "Exec: ${SYNCCMD_HIDDENPW}" - echo "Sync Configuration" > ${LOGFILE} - echo "====================" >> ${LOGFILE} - date >> ${LOGFILE} - echo ${SYNCCMD_HIDDENPW} >> ${LOGFILE} - echo "" >> ${LOGFILE} - ${SYNCCMD} >> ${LOGFILE} 2>&1 + echo "Sync Configuration" + echo "====================" + date + echo ${SYNCCMD_HIDDENPW} + echo "" + ${SYNCCMD} if [[ $? -ne 0 ]]; then - echo "Error in sync:" - echo "****" - cat ${LOGFILE} - echo "****" + echo "Error in sync: Check Logfile ${LOGFILE}" echo "" echo "Please check if your Token is setup right and for the above Output" read -n 1 -s -r -p "Press any key to continue" @@ -68,20 +57,20 @@ if [[ ! -z "${DISTCONFIGPATH_SRC}" ]]; then fi # Then, sync all client_software-files if [[ ! -z "${CLIENT_SOFTWARE_SRC}" ]]; then + echo "Syncing central softwarerepository ${CLIENT_SOFTWARE_DST}" + # Create Directory if not existent + mkdir -p ${CLIENT_SOFTWARE_DST} 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***}" ) echo "Exec: ${SYNCCMD_HIDDENPW}" - echo "Sync Client Software" > ${LOGFILE} - echo "====================" >> ${LOGFILE} - date >> ${LOGFILE} - echo ${SYNCCMD_HIDDENPW} >> ${LOGFILE} - echo "" >> ${LOGFILE} - ${SYNCCMD} >> ${LOGFILE} 2>&1 + echo "Sync Client Software" + echo "====================" + date + echo ${SYNCCMD_HIDDENPW} + echo "" + ${SYNCCMD} if [[ $? -ne 0 ]]; then - echo "Error in sync:" - echo "****" - cat ${LOGFILE} - echo "****" + echo "Error in sync: Check Logfile ${LOGFILE}" echo "" echo "Please check if your Token is setup right and for the above Output" read -n 1 -s -r -p "Press any key to continue"