diff --git a/scripts/get-dashboard.sh b/scripts/get-dashboard.sh index 99c5b5330..d74b74d0c 100755 --- a/scripts/get-dashboard.sh +++ b/scripts/get-dashboard.sh @@ -10,16 +10,13 @@ RELEASE_ASSET_FILE="emqx-dashboard.zip" if [ -f 'EMQX_ENTERPRISE' ]; then VERSION="${EMQX_EE_DASHBOARD_VERSION}" DASHBOARD_PATH='lib-ee/emqx_dashboard/priv' - DASHBOARD_REPO='emqx-enterprise-dashboard-frontend-src' - AUTH="Authorization: token $(cat scripts/git-token)" - # have to be resolved with auth and redirect - DIRECT_DOWNLOAD_URL="" + DASHBOARD_REPO='emqx-dashboard-web' + DIRECT_DOWNLOAD_URL="https://github.com/emqx/${DASHBOARD_REPO}/releases/download/${VERSION}/${RELEASE_ASSET_FILE}" else VERSION="${EMQX_CE_DASHBOARD_VERSION}" DASHBOARD_PATH='lib-ce/emqx_dashboard/priv' DASHBOARD_REPO='emqx-dashboard-frontend' - AUTH="" - DIRECT_DOWNLOAD_URL="https://github.com/emqx/${DASHBOARD_REPO}/releases/download/${VERSION}/emqx-dashboard.zip" + DIRECT_DOWNLOAD_URL="https://github.com/emqx/${DASHBOARD_REPO}/releases/download/${VERSION}/${RELEASE_ASSET_FILE}" fi case $(uname) in @@ -35,27 +32,6 @@ if [ -d "$DASHBOARD_PATH/www" ] && [ "$(version)" = "$VERSION" ]; then exit 0 fi -find_url() { - # Get the download URL of our desired asset - release_url="https://api.github.com/repos/emqx/${DASHBOARD_REPO}/releases/tags/${VERSION}" - release_info="$(curl --silent --show-error --header "${AUTH}" --header "Accept: application/vnd.github.v3+json" "$release_url")" - if ! download_url="$(echo "$release_info" | jq --raw-output ".assets[] | select(.name==\"${RELEASE_ASSET_FILE}\").url" | tr -d '\n' | tr -d '\r')"; then - echo "failed to query $release_url" - echo "${release_info}" - exit 1 - fi - # Get GitHub's S3 redirect URL - curl --silent --show-error \ - --header "${AUTH}" \ - --header "Accept: application/octet-stream" \ - --write-out "%{redirect_url}" \ - "$download_url" -} - -if [ -z "$DIRECT_DOWNLOAD_URL" ]; then - DIRECT_DOWNLOAD_URL="$(find_url)" -fi - curl -L --silent --show-error \ --header "Accept: application/octet-stream" \ --output "${RELEASE_ASSET_FILE}" \