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

build: fix shellcheck

This commit is contained in:
Zaiming (Stone) Shi 2022-02-22 09:40:32 +01:00
parent 18feec9030
commit fb7944391d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.ci/build_packages/tests.sh
View File

@ -24,7 +24,7 @@ export RELUP_PACKAGE_PATH="${CODE_PATH}/_upgrade_base"
# export EMQX_NODE_NAME="emqx-on-$(uname -m)@127.0.0.1" # export EMQX_NODE_NAME="emqx-on-$(uname -m)@127.0.0.1"
# export EMQX_NODE_COOKIE=$(date +%s%N) # export EMQX_NODE_COOKIE=$(date +%s%N)
SYSTEM="$($CODE_PATH/scripts/get-distro.sh)" SYSTEM="$("$CODE_PATH"/scripts/get-distro.sh)"
if [ "$PACKAGE_TYPE" = 'zip' ]; then if [ "$PACKAGE_TYPE" = 'zip' ]; then
PKG_SUFFIX="zip" PKG_SUFFIX="zip"
@ -39,8 +39,8 @@ else
esac esac
fi fi
PACKAGE_NAME="${PROFILE}-$($CODE_PATH/scripts/pkg-full-vsn.sh)" PACKAGE_NAME="${PROFILE}-$("$CODE_PATH"/scripts/pkg-full-vsn.sh)"
OLD_PACKAGE_PATTERN="${PROFILE}-$($CODE_PATH/scripts/pkg-full-vsn.sh 'vsn_matcher')" OLD_PACKAGE_PATTERN="${PROFILE}-$("$CODE_PATH"/scripts/pkg-full-vsn.sh 'vsn_matcher')"
PACKAGE_FILE_NAME="${PACKAGE_NAME}.${PKG_SUFFIX}" PACKAGE_FILE_NAME="${PACKAGE_NAME}.${PKG_SUFFIX}"
PACKAGE_FILE="${PACKAGE_PATH}/${PACKAGE_FILE_NAME}" PACKAGE_FILE="${PACKAGE_PATH}/${PACKAGE_FILE_NAME}"
@ -117,7 +117,7 @@ emqx_test(){
;; ;;
"rpm") "rpm")
yum install -y "${PACKAGE_PATH}/${packagename}" yum install -y "${PACKAGE_PATH}/${packagename}"
if ! rpm -q ${PROFILE} | grep -q "${PROFILE}"; then if ! rpm -q "${PROFILE}" | grep -q "${PROFILE}"; then
echo "package install error" echo "package install error"
exit 1 exit 1
fi fi

2
scripts/buildx.sh
View File

@ -71,7 +71,7 @@ cd "${SRC_DIR:-.}"
set -x set -x
docker info docker info
docker run --rm --privileged tonistiigi/binfmt:latest --install ${ARCH} docker run --rm --privileged tonistiigi/binfmt:latest --install "${ARCH}"
docker run -i --rm \ docker run -i --rm \
-v "$(pwd)":/emqx \ -v "$(pwd)":/emqx \
--workdir /emqx \ --workdir /emqx \