From 54a6674b088f95ef2f89990324f0b696bad09f54 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Mon, 22 Aug 2022 17:33:24 -0300 Subject: [PATCH] style: fix indentation --- build | 40 +++++++++++++++++----------------- scripts/relup-base-packages.sh | 4 ++-- scripts/relup-base-vsns.sh | 4 ++-- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build b/build index d3c9916e1..fb2ecf8bb 100755 --- a/build +++ b/build @@ -67,7 +67,7 @@ make_rel() { } 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 @@ -78,24 +78,24 @@ make_relup() { mkdir -p "$lib_dir" "$releases_dir" '_upgrade_base' local releases=() if [ -d "$releases_dir" ]; then - for BASE_VSN in $(relup_db base-vsns "$PKG_VSN"); do - 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')" - while read -r zip; do - local base_vsn - 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 - local tmp_dir - tmp_dir="$(mktemp -d -t emqx.XXXXXXX)" - unzip -q "$zip" "emqx/releases/*" -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/lib"/* "$lib_dir" || true - rm -rf "$tmp_dir" - fi - releases+=( "$base_vsn" ) - done < <("$FIND" _upgrade_base -maxdepth 1 -name "${name_pattern}.zip" -type f) - done + for BASE_VSN in $(relup_db base-vsns "$PKG_VSN"); do + 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')" + while read -r zip; do + local base_vsn + 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 + local tmp_dir + tmp_dir="$(mktemp -d -t emqx.XXXXXXX)" + unzip -q "$zip" "emqx/releases/*" -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/lib"/* "$lib_dir" || true + rm -rf "$tmp_dir" + fi + releases+=( "$base_vsn" ) + done < <("$FIND" _upgrade_base -maxdepth 1 -name "${name_pattern}.zip" -type f) + done fi if [ ${#releases[@]} -eq 0 ]; then log "No upgrade base found, relup ignored" @@ -191,7 +191,7 @@ make_zip() { # shellcheck disable=SC2207 bases=($(relup_db base-vsns "$PKG_VSN")) if [[ "${#bases[@]}" -eq 0 ]]; then - has_relup='no' + has_relup='no' fi if [ "$has_relup" = 'yes' ]; then ./scripts/inject-relup.escript "${tard}/emqx/releases/${PKG_VSN}/relup" diff --git a/scripts/relup-base-packages.sh b/scripts/relup-base-packages.sh index bc1d8977e..416030219 100755 --- a/scripts/relup-base-packages.sh +++ b/scripts/relup-base-packages.sh @@ -64,7 +64,7 @@ mkdir -p _upgrade_base pushd _upgrade_base 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 @@ -82,7 +82,7 @@ for tag in $(../scripts/relup-base-vsns.sh $EDITION | xargs echo -n); do echo "${SUMSTR} ${filename}" | $SHASUM -c || exit 1 fi 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 done diff --git a/scripts/relup-base-vsns.sh b/scripts/relup-base-vsns.sh index 03809dab8..c5ccb462f 100755 --- a/scripts/relup-base-vsns.sh +++ b/scripts/relup-base-vsns.sh @@ -55,8 +55,8 @@ TAGS=( 'dummy' ) TAGS_EXCLUDE=( 'dummy' ) while read -r vsn; do - # shellcheck disable=SC2207 - TAGS+=($(git tag -l "${GIT_TAG_PREFIX}${vsn}")) + # shellcheck disable=SC2207 + TAGS+=($(git tag -l "${GIT_TAG_PREFIX}${vsn}")) done < <(./scripts/relup-base-vsns.escript base-vsns "$CUR" ./data/relup_bases.eterm) for tag_to_del in "${TAGS_EXCLUDE[@]}"; do