diff --git a/base/apps/indie_external/lib/SitesManager.php b/base/apps/indie_external/lib/SitesManager.php index 0675f29aac6c244e70541e7bea7e482bbbf7ef78..00e8aaf7babac5c953085a8741599a3be7666d30 100644 --- a/base/apps/indie_external/lib/SitesManager.php +++ b/base/apps/indie_external/lib/SitesManager.php @@ -171,7 +171,7 @@ class SitesManager { if ($site['name'] === 'Chat') { $chat_url = getenv('CHAT_URL', true) ?: getenv('CHAT_URL'); - if (!$chat_url) { + if (!$chat_url) { // if CHAT_URL is empty or false, continue the loop and skip this item continue; } else { $site['url'] = str_replace(['{chat_url}'], [$chat_url], $site['url']); @@ -188,8 +188,12 @@ class SitesManager { if ($site['name'] === 'Visio') { $visio_url = getenv('VISIO_URL', true) ?: getenv('VISIO_URL'); - if ($visio_url) { - $site['url'] = $visio_url; + if ($visio_url !== '') { // if VISIO_URL is empty, we use the default provided in the json + if ($visio_url == 'false') { // if VISIO_URL is 'false', continue the loop and skip this item + continue; + } else { + $site['url'] = $visio_url; + } } } diff --git a/ci/functions b/ci/functions index e77e57979096d2b9ebc5dc43a1aa1057dfa2fb80..3b184eb1a9ebfc367cdd2d69fbce2e61dd665075 100644 --- a/ci/functions +++ b/ci/functions @@ -1,6 +1,6 @@ function prepare_env() { curl https://api.github.com/repos/nextcloud/server/tags?per_page=50 > /tmp/tags - export MINOR_VERSION=`cat /tmp/tags | jq '.[] | select(.name|test("v'${MARKETTING_VERSION}'.")).name' | head -n1 | cut -d\" -f2 | cut -c2-` + export MINOR_VERSION=`cat /tmp/tags | jq '.[] | select(.name|test(".rc.")|not) |select(.name|test("v'${MARKETTING_VERSION}'.")).name' | head -n1 | cut -d\" -f2 | cut -c2-` export PATCH_NUMBER=`curl https://raw.githubusercontent.com/nextcloud/server/v${MINOR_VERSION}/version.php | grep '$OC_Version =' | cut -d, -f4 | cut -d] -f1 | xargs` echo "MARKETTING_VERSION=$MARKETTING_VERSION" echo "MINOR_VERSION=$MINOR_VERSION"