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

style: fix indentation

This commit is contained in:
Thales Macedo Garitezi 2022-08-22 17:33:24 -03:00
parent 6f40405242
commit 54a6674b08
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build
View File

@ -67,7 +67,7 @@ make_rel() {
} }
relup_db() { relup_db() {
./scripts/relup-base-vsns.escript "$@" ./data/relup_bases.eterm ./scripts/relup-base-vsns.escript "$@" ./data/relup_bases.eterm
} }
## unzip previous version .zip files to _build/$PROFILE/rel/emqx/releases before making relup ## unzip previous version .zip files to _build/$PROFILE/rel/emqx/releases before making relup
@ -78,24 +78,24 @@ make_relup() {
mkdir -p "$lib_dir" "$releases_dir" '_upgrade_base' mkdir -p "$lib_dir" "$releases_dir" '_upgrade_base'
local releases=() local releases=()
if [ -d "$releases_dir" ]; then if [ -d "$releases_dir" ]; then
for BASE_VSN in $(relup_db base-vsns "$PKG_VSN"); do for BASE_VSN in $(relup_db base-vsns "$PKG_VSN"); do
OTP_BASE=$(relup_db otp-vsn-for "$PKG_VSN") OTP_BASE=$(relup_db otp-vsn-for "$PKG_VSN")
name_pattern="${PROFILE}-$(env OTP_VSN="$OTP_BASE" PKG_VSN="$BASE_VSN" ./scripts/pkg-full-vsn.sh 'vsn_exact')" name_pattern="${PROFILE}-$(env OTP_VSN="$OTP_BASE" PKG_VSN="$BASE_VSN" ./scripts/pkg-full-vsn.sh 'vsn_exact')"
while read -r zip; do while read -r zip; do
local base_vsn local base_vsn
base_vsn="$(echo "$zip" | grep -oE "[0-9]+\.[0-9]+\.[0-9]+(-[0-9a-f]{8})?" | head -1)" base_vsn="$(echo "$zip" | grep -oE "[0-9]+\.[0-9]+\.[0-9]+(-[0-9a-f]{8})?" | head -1)"
if [ ! -d "$releases_dir/$base_vsn" ]; then if [ ! -d "$releases_dir/$base_vsn" ]; then
local tmp_dir local tmp_dir
tmp_dir="$(mktemp -d -t emqx.XXXXXXX)" tmp_dir="$(mktemp -d -t emqx.XXXXXXX)"
unzip -q "$zip" "emqx/releases/*" -d "$tmp_dir" unzip -q "$zip" "emqx/releases/*" -d "$tmp_dir"
unzip -q "$zip" "emqx/lib/*" -d "$tmp_dir" unzip -q "$zip" "emqx/lib/*" -d "$tmp_dir"
cp -r -n "$tmp_dir/emqx/releases"/* "$releases_dir" || true cp -r -n "$tmp_dir/emqx/releases"/* "$releases_dir" || true
cp -r -n "$tmp_dir/emqx/lib"/* "$lib_dir" || true cp -r -n "$tmp_dir/emqx/lib"/* "$lib_dir" || true
rm -rf "$tmp_dir" rm -rf "$tmp_dir"
fi fi
releases+=( "$base_vsn" ) releases+=( "$base_vsn" )
done < <("$FIND" _upgrade_base -maxdepth 1 -name "${name_pattern}.zip" -type f) done < <("$FIND" _upgrade_base -maxdepth 1 -name "${name_pattern}.zip" -type f)
done done
fi fi
if [ ${#releases[@]} -eq 0 ]; then if [ ${#releases[@]} -eq 0 ]; then
log "No upgrade base found, relup ignored" log "No upgrade base found, relup ignored"
@ -191,7 +191,7 @@ make_zip() {
# shellcheck disable=SC2207 # shellcheck disable=SC2207
bases=($(relup_db base-vsns "$PKG_VSN")) bases=($(relup_db base-vsns "$PKG_VSN"))
if [[ "${#bases[@]}" -eq 0 ]]; then if [[ "${#bases[@]}" -eq 0 ]]; then
has_relup='no' has_relup='no'
fi fi
if [ "$has_relup" = 'yes' ]; then if [ "$has_relup" = 'yes' ]; then
./scripts/inject-relup.escript "${tard}/emqx/releases/${PKG_VSN}/relup" ./scripts/inject-relup.escript "${tard}/emqx/releases/${PKG_VSN}/relup"

4
scripts/relup-base-packages.sh
View File

@ -64,7 +64,7 @@ mkdir -p _upgrade_base
pushd _upgrade_base pushd _upgrade_base
otp_vsn_for() { otp_vsn_for() {
../scripts/relup-base-vsns.escript otp-vsn-for "${1#[e|v]}" ../data/relup_bases.eterm ../scripts/relup-base-vsns.escript otp-vsn-for "${1#[e|v]}" ../data/relup_bases.eterm
} }
for tag in $(../scripts/relup-base-vsns.sh $EDITION | xargs echo -n); do for tag in $(../scripts/relup-base-vsns.sh $EDITION | xargs echo -n); do
@ -82,7 +82,7 @@ for tag in $(../scripts/relup-base-vsns.sh $EDITION | xargs echo -n); do
echo "${SUMSTR} ${filename}" | $SHASUM -c || exit 1 echo "${SUMSTR} ${filename}" | $SHASUM -c || exit 1
fi fi
else else
echo "file $filename already downloaded or doesn't exist in the archives; skipping it" echo "file $filename already downloaded or doesn't exist in the archives; skipping it"
fi fi
done done

4
scripts/relup-base-vsns.sh
View File

@ -55,8 +55,8 @@ TAGS=( 'dummy' )
TAGS_EXCLUDE=( 'dummy' ) TAGS_EXCLUDE=( 'dummy' )
while read -r vsn; do while read -r vsn; do
# shellcheck disable=SC2207 # shellcheck disable=SC2207
TAGS+=($(git tag -l "${GIT_TAG_PREFIX}${vsn}")) TAGS+=($(git tag -l "${GIT_TAG_PREFIX}${vsn}"))
done < <(./scripts/relup-base-vsns.escript base-vsns "$CUR" ./data/relup_bases.eterm) done < <(./scripts/relup-base-vsns.escript base-vsns "$CUR" ./data/relup_bases.eterm)
for tag_to_del in "${TAGS_EXCLUDE[@]}"; do for tag_to_del in "${TAGS_EXCLUDE[@]}"; do