yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(dashboard): update get-dashboard script

This commit is contained in:
Turtle 2021-08-03 16:48:19 +08:00 committed by turtleDeng
parent 5cefcd37d5
commit 32534d2372
2 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@ BUILD = $(CURDIR)/build
SCRIPTS = $(CURDIR)/scripts SCRIPTS = $(CURDIR)/scripts
export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh) export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
export EMQX_DESC ?= EMQ X 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) ifeq ($(OS),Windows_NT)
export REBAR_COLOR=none export REBAR_COLOR=none
endif endif

40
scripts/get-dashboard.sh
View File

@ -6,21 +6,10 @@ set -euo pipefail
cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.." cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
RELEASE_ASSET_FILE="emqx-dashboard.zip" RELEASE_ASSET_FILE="emqx-dashboard.zip"
VERSION="${EMQX_DASHBOARD_VERSION}"
if [ -f 'EMQX_ENTERPRISE' ]; then DASHBOARD_PATH='apps/emqx_dashboard/priv'
VERSION="${EMQX_EE_DASHBOARD_VERSION}" DASHBOARD_REPO='emqx-dashboard-web'
DASHBOARD_PATH='lib-ee/emqx_dashboard/priv' DIRECT_DOWNLOAD_URL="https://github.com/emqx/${DASHBOARD_REPO}/releases/download/${VERSION}/${RELEASE_ASSET_FILE}"
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
case $(uname) in case $(uname) in
*Darwin*) SED="sed -E";; *Darwin*) SED="sed -E";;
@ -35,27 +24,6 @@ if [ -d "$DASHBOARD_PATH/www" ] && [ "$(version)" = "$VERSION" ]; then
exit 0 exit 0
fi 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 \ curl -L --silent --show-error \
--header "Accept: application/octet-stream" \ --header "Accept: application/octet-stream" \
--output "${RELEASE_ASSET_FILE}" \ --output "${RELEASE_ASSET_FILE}" \