Просмотр исходного кода

chore(dashboard): update get-dashboard script

Turtle 4 лет назад
Родитель
Сommit
32534d2372
2 измененных файлов с 5 добавлено и 37 удалено
  1. 1 1
      Makefile
  2. 4 36
      scripts/get-dashboard.sh

+ 1 - 1
Makefile

@@ -5,7 +5,7 @@ BUILD = $(CURDIR)/build
 SCRIPTS = $(CURDIR)/scripts
 export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
 export EMQX_DESC ?= EMQ X
-export EMQX_CE_DASHBOARD_VERSION ?= v4.3.1
+export EMQX_DASHBOARD_VERSION ?= v5.0.0-beta.3
 ifeq ($(OS),Windows_NT)
 	export REBAR_COLOR=none
 endif

+ 4 - 36
scripts/get-dashboard.sh

@@ -6,21 +6,10 @@ set -euo pipefail
 cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
 
 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=""
-else
-    VERSION="${EMQX_CE_DASHBOARD_VERSION}"
-    DASHBOARD_PATH='apps/emqx_dashboard/priv'
-    DASHBOARD_REPO='emqx-dashboard-frontend'
-    AUTH=""
-    DIRECT_DOWNLOAD_URL="https://github.com/emqx/${DASHBOARD_REPO}/releases/download/${VERSION}/emqx-dashboard.zip"
-fi
+VERSION="${EMQX_DASHBOARD_VERSION}"
+DASHBOARD_PATH='apps/emqx_dashboard/priv'
+DASHBOARD_REPO='emqx-dashboard-web'
+DIRECT_DOWNLOAD_URL="https://github.com/emqx/${DASHBOARD_REPO}/releases/download/${VERSION}/${RELEASE_ASSET_FILE}"
 
 case $(uname) in
     *Darwin*) SED="sed -E";;
@@ -35,27 +24,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}" \