From 220b92220dde3bf5637b5ad28a1212045c875813 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 24 Aug 2020 16:50:58 +1000 Subject: Fix the test release path URL logic --- rtems-release-test | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/rtems-release-test b/rtems-release-test index 2b971b8..07bf032 100755 --- a/rtems-release-test +++ b/rtems-release-test @@ -146,14 +146,17 @@ bsets="${bsets} ${bsp_ver}bsps/imx7" # # Is this an RC or snapshot build in the default RTEMS release path? # -if [ ${release_url} = ${rtems_release_url} -a \ - $(echo ${revision} | sed 's/.*-.*/yes/') = yes ]; then +if [ ${release_url} = ${rtems_release_url} ]; then release_url=${release_url}/${version} - if [ $(echo ${revision} | sed 's/.*-rc.*/yes/') = yes ]; then - release_url=${release_url}/rc/${release} + if [ $(echo ${revision} | sed 's/.*-.*/yes/') = yes ]; then + if [ $(echo ${revision} | sed 's/.*-rc.*/yes/') = yes ]; then + release_url=${release_url}/rc/${release} + else + revision_number=$(echo ${revision} | sed 's/-.*//') + release_url=${release_url}/${revision_number}/${release} + fi else - revision_number=$(echo ${revision} | sed 's/-.*//') - release_url=${release_url}/${revision_number}/${release} + release_url=${release_url}/${release} fi fi -- cgit v1.2.3