forked from obel1x/fedora-OEMDRV
Improved errorhandling of sw install
This commit is contained in:
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -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}
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user