From fe943ac0e40c1e8a619246bab5ed98ff136a9641 Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Fri, 4 Oct 2019 17:10:17 +0200 Subject: [PATCH] CI: fix shellcheck issues (#789) Signed-off-by: Mario Trangoni --- .circleci/deploy-docs.sh | 10 +++++----- .circleci/make-release.sh | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/deploy-docs.sh b/.circleci/deploy-docs.sh index ab919f2..e497ad0 100755 --- a/.circleci/deploy-docs.sh +++ b/.circleci/deploy-docs.sh @@ -10,15 +10,15 @@ set -o pipefail echo "current dir: $(pwd)" # Setup git env -git config --global user.email $CI_GIT_EMAIL -git config --global user.name $CI_GIT_USER +git config --global user.email "$CI_GIT_EMAIL" +git config --global user.name "$CI_GIT_USER" echo "git user is $CI_GIT_USER ($CI_GIT_EMAIL)" -git checkout -b $GH_PAGES_BRANCH -rm -rf * || true +git checkout -b "$GH_PAGES_BRANCH" +rm -rf ./* || true mv ../gh-pages/docs/site/* ./ git add --force . git commit -m "build docs from commit ${CIRCLE_SHA1:0:7} (branch $CIRCLE_BRANCH)" git log -n 3 -git push origin $GH_PAGES_BRANCH --force +git push origin "$GH_PAGES_BRANCH" --force diff --git a/.circleci/make-release.sh b/.circleci/make-release.sh index e0efc96..de0e8d9 100755 --- a/.circleci/make-release.sh +++ b/.circleci/make-release.sh @@ -8,13 +8,13 @@ set -o errexit set -o pipefail # Setup git env -git config --global user.email $CI_GIT_EMAIL -git config --global user.name $CI_GIT_USER +git config --global user.email "$CI_GIT_EMAIL" +git config --global user.name "$CI_GIT_USER" echo "git user is $CI_GIT_USER ($CI_GIT_EMAIL)" -RELEASE_VER=$(echo $CIRCLE_TAG | grep -Po "(?<=v)[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)") +RELEASE_VER=$(echo "$CIRCLE_TAG" | grep -Po "(?<=v)[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)") -if [ -z $RELEASE_VER ]; then +if [ -z "$RELEASE_VER" ]; then echo "No release version provided" exit 1 fi @@ -28,7 +28,7 @@ fi RELEASE_BRANCH=release-$RELEASE_VER # Build plugin -git checkout -b $RELEASE_BRANCH +git checkout -b "$RELEASE_BRANCH" yarn install --pure-lockfile && yarn build # Commit release @@ -36,7 +36,7 @@ git add --force dist/ git commit -m "release $RELEASE_VER" RELEASE_COMMIT_HASH=$(git log -n 1 | grep -Po "(?<=commit )[0-9a-z]{40}") -echo $RELEASE_COMMIT_HASH +echo "$RELEASE_COMMIT_HASH" # Push release branch -git push origin $RELEASE_BRANCH +git push origin "$RELEASE_BRANCH"