use global wget options in addition to specific wget options

This commit is contained in:
Daniel Steglich 2015-03-26 18:45:17 +01:00
parent 2c36160237
commit 4977258f78

View File

@ -300,12 +300,12 @@ doUpdate()
if [ ! -z "${updateurl}" ];then if [ ! -z "${updateurl}" ];then
doReplaceVars doReplaceVars
if [ "${basicauth}" = "enabled" ];then if [ "${basicauth}" = "enabled" ];then
local wgetoptions=" --user ${user} --password ${pass} " WGETOPTIONS="${WGETOPTIONS} --user ${user} --password ${pass} "
fi fi
if [ "${ignoreCertError}" = "enabled" ];then if [ "${ignoreCertError}" = "enabled" ];then
local wgetoptions=" --no-check-certificate " WGETOPTIONS="${WGETOPTIONS} --no-check-certificate "
fi fi
local cmd="${WGET} ${wgetoptions} ${updateurl}" local cmd="${WGET} ${WGETOPTIONS} ${updateurl}"
$cmd $cmd
# ToDo: check the returning text from WEB Server. User need to give expected string. # ToDo: check the returning text from WEB Server. User need to give expected string.
if [ ${?} -eq 0 ];then if [ ${?} -eq 0 ];then