refactor:

This commit is contained in:
lsxredrain 2021-09-11 12:02:55 +08:00
parent 160bbf2291
commit 7eeba95091
6 changed files with 13 additions and 32 deletions

View File

@ -1,9 +1,10 @@
# [](https://github.com/dgiot/dgiot/compare/v4.3.1...v) (2021-09-09)
# [](https://github.com/dgiot/dgiot/compare/v4.3.1...v) (2021-09-11)
### Bug Fixes
* addtd files ([c91a199](https://github.com/dgiot/dgiot/commit/c91a1993cd06777eb9304a07068ef1000f20aa00))
* device_card ([50914b4](https://github.com/dgiot/dgiot/commit/50914b4bbefb9fcdf5049d5c4a36cac21819786f))
* devicelog ([e747cee](https://github.com/dgiot/dgiot/commit/e747cee225e37f1050026781fe89418b19dadc7e))
* igore rebar.config ([5e61214](https://github.com/dgiot/dgiot/commit/5e61214789aa382f6a8be126830b14c3c834a1cc))
* parse.conf ([488c12e](https://github.com/dgiot/dgiot/commit/488c12e793fa2b94acfa01d0585072ca3a47d275))

View File

@ -10,11 +10,7 @@ ifeq ($(OS),Windows_NT)
export REBAR_COLOR=none
endif
ifeq ($(OS),Windows_NT)
GET_DASHBOARD=$(SCRIPTS)/get-windashboard.sh
else
GET_DASHBOARD=$(SCRIPTS)/get-dashboard.sh
endif
GET_DASHBOARD=$(SCRIPTS)/get-dashboard.sh
PROFILE ?= emqx
REL_PROFILES := emqx emqx-edge

View File

@ -7,7 +7,8 @@ set -euo pipefail
# ensure dir
cd -P -- "$(dirname -- "$0")/.."
echo "find props"
exit 0
BASEDIR="."
if [ "$1" != "emqx" ]; then
BASEDIR="$1"

View File

@ -8,6 +8,9 @@ set -euo pipefail
# ensure dir
cd -P -- "$(dirname -- "$0")/.."
echo "find suite"
exit 0
TESTDIR="test"
if [ "$1" != "emqx" ]; then
TESTDIR="$1/test"

View File

@ -5,21 +5,16 @@ set -euo pipefail
# ensure dir
cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
RELEASE_ASSET_FILE="emqx-dashboard.zip"
DASHBOARD_PATH='lib-ce/emqx_dashboard/priv'
DIRECT_DOWNLOAD_URL="http://dgiot-1253666439.cos.ap-shanghai-fsi.myqcloud.com/dgiot_release/emqx_dashboard.zip"
DIRECT_DOWNLOAD_URL="http://dgiot-1253666439.cos.ap-shanghai-fsi.myqcloud.com/dgiot_release/v4.4.0/www.tar.gz"
if [ -d "$DASHBOARD_PATH/www" ]; then
exit 0
fi
rm -rf emqx_dashboard.zip
rm -rf www
wget http://dgiot-1253666439.cos.ap-shanghai-fsi.myqcloud.com/dgiot_release/emqx_dashboard.zip
unzip emqx_dashboard.zip
rm -rf "$DASHBOARD_PATH/www"
mv "./www" "./lib-ce/emqx_dashboard/priv/"
rm -rf emqx_dashboard.zip
wget ${DIRECT_DOWNLOAD_URL}
tar xvf www.tar.gz
mv www "$DASHBOARD_PATH/"
rm www.tar.gz -rf
chmod 777 ./scripts/*

View File

@ -1,15 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
# ensure dir
cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
if [ -d "_build" ];then
echo ""
else
# wget http://dgiot-1253666439.cos.ap-shanghai-fsi.myqcloud.com/dgiot_release/_build.tar.gz -O _build.tar.gz
# tar xvf _build.tar.gz
echo "emqx_dashboard"
fi
echo "emqx_dashboard"