From add6f928e6a95d14b511ebd59e0fba231747cdbb Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Wed, 19 Dec 2018 00:14:38 +0100 Subject: Switch to https protocol for IoT.bzh urls http is still supported but redirected to https and consequently curl commands used in this script receive a 302 response that silently skips IoT.bzh sdks processing. Change-Id: I6854be1f3f8a42d77657fe45658782c3dc5b8b38 Signed-off-by: Sebastien Douheret --- scripts/sdks/agl/_build-sdks-json.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/sdks/agl/_build-sdks-json.sh b/scripts/sdks/agl/_build-sdks-json.sh index 7b67b86..4d67bbf 100755 --- a/scripts/sdks/agl/_build-sdks-json.sh +++ b/scripts/sdks/agl/_build-sdks-json.sh @@ -52,7 +52,7 @@ IMG_AGL_URL_SUFFIX="/deploy/images/" ####################################### ### Define urls where SDKs can be downloaded / IoT.bzh part -SDK_IOTBZH_BASEURL="http://iot.bzh/download/public/XDS/images/" +SDK_IOTBZH_BASEURL="https://iot.bzh/download/public/XDS/images/" DOWNLOADABLE_IOTBZH_URLS=" dab-m3ulcb/* @@ -62,9 +62,9 @@ DOWNLOADABLE_IOTBZH_URLS=" flounder-h3ulcb/* flounder-m3ulcb/* flounder-qemux86-64/* - - master-m3ulcb/* " +# master-m3ulcb/* + SDK_IOTBZH_URL_SUFFIX="/sdk/" IMG_IOTBZH_URL_SUFFIX="/images/" @@ -207,9 +207,9 @@ EndOfMessage } DEBUG=0 -if [[ ${1:0:2} = "-v" ]] ; then - verbose=$(echo -s ${1} | sed -E "s/-([v]+).*/\1/") - DEBUG=$(echo ${verbose} | wc -c) +if [ "${1}" = "-v" ] ; then + shift + DEBUG=${1} echo "Set verbosity level to : ${DEBUG}" shift fi @@ -219,7 +219,8 @@ sdksList=" " for base_url in $DOWNLOADABLE_AGL_URLS do dbg_debug "Look into ${base_url}" - urls="$(expand_url $base_url $SDK_AGL_BASEURL)" + urls="$(expand_url ${base_url} $SDK_AGL_BASEURL)" + [ "$urls" = "" ] && { echo "ERROR: empty response while expanding ${SDK_AGL_BASEURL}${base_url}"; exit 1; } for url in $urls do dbg_debug "URL to check: ${url}" @@ -230,7 +231,8 @@ done for base_url in $DOWNLOADABLE_IOTBZH_URLS do dbg_debug "Look into ${base_url}" - urls="$(expand_url $base_url $SDK_IOTBZH_BASEURL)" + urls="$(expand_url ${base_url} $SDK_IOTBZH_BASEURL)" + [ "$urls" = "" ] && { echo "ERROR: empty response while expanding ${SDK_IOTBZH_BASEURL}${base_url}"; exit 1; } for url in $urls do dbg_debug "URL to check: ${url}" -- cgit 1.2.3-korg