From e706a67427a03703f5973fe734adc0fe8dd75b60 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 19 Jul 2024 18:39:30 +0900 Subject: [PATCH] Shellcheck updates for publish.sh script --- .shellcheckrc | 2 ++ publish/publish.sh | 31 ++++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 .shellcheckrc diff --git a/.shellcheckrc b/.shellcheckrc new file mode 100644 index 0000000..b14745b --- /dev/null +++ b/.shellcheckrc @@ -0,0 +1,2 @@ +shell=bash +external-sources=true diff --git a/publish/publish.sh b/publish/publish.sh index 318c062..c56ac3e 100755 --- a/publish/publish.sh +++ b/publish/publish.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BASE_FOLDER=$(dirname $(readlink -f $0))"/"; +BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/"; PACKAGE_DOWNLOAD="${BASE_FOLDER}package-download/"; if [ ! -d "${PACKAGE_DOWNLOAD}" ]; then mkdir "${PACKAGE_DOWNLOAD}"; @@ -15,8 +15,8 @@ if [ -z "${VERSION}" ]; then fi; # compare version, if different or newer, deploy if [ -f "${file_last_published}" ]; then - LAST_PUBLISHED_VERSION=$(cat ${file_last_published}); - if $(dpkg --compare-versions "${VERSION}" le "${LAST_PUBLISHED_VERSION}"); then + LAST_PUBLISHED_VERSION=$(cat "${file_last_published}"); + if dpkg --compare-versions "${VERSION}" le "${LAST_PUBLISHED_VERSION}"; then echo "git tag version ${VERSION} is not newer than previous published version ${LAST_PUBLISHED_VERSION}"; exit; fi; @@ -40,9 +40,10 @@ if [ ! -f "${BASE_FOLDER}.env.deploy" ]; then exit; fi; set -o allexport; -cd ${BASE_FOLDER}; +cd "${BASE_FOLDER}" || exit; +# shellcheck source=.env.deploy source .env.deploy; -cd -; +cd - || exit; set +o allexport; if [ "${go_flag}" != "go" ]; then @@ -55,21 +56,21 @@ fi; echo "[START]"; # gitea # skip iof -if [ ! -z "${GITEA_PUBLISH}" ]; then - if [ ! -z "${GITEA_UPLOAD_FILENAME}" ] && - [ ! -z "${GITEA_URL_DL}" ] && [ ! -z "${GITEA_URL_PUSH}" ] && - [ ! -z "${GITEA_USER}" ] && [ ! -z "${GITEA_TOKEN}" ]; then +if [ -n "${GITEA_PUBLISH}" ]; then + if [ -n "${GITEA_UPLOAD_FILENAME}" ] && + [ -n "${GITEA_URL_DL}" ] && [ -n "${GITEA_URL_PUSH}" ] && + [ -n "${GITEA_USER}" ] && [ -n "${GITEA_TOKEN}" ]; then if [ ! -f "${PACKAGE_DOWNLOAD}${GITEA_UPLOAD_FILENAME}-v${VERSION}.zip" ]; then curl -LJO \ --output-dir "${PACKAGE_DOWNLOAD}" \ - ${GITEA_URL_DL}/v${VERSION}.zip; + "${GITEA_URL_DL}"/v"${VERSION}".zip; fi; if [ ! -f "${PACKAGE_DOWNLOAD}${GITEA_UPLOAD_FILENAME}-v${VERSION}.zip" ]; then echo "Version file does not exist for ${VERSION}"; else - curl --user ${GITEA_USER}:${GITEA_TOKEN} \ + curl --user "${GITEA_USER}":"${GITEA_TOKEN}" \ --upload-file "${PACKAGE_DOWNLOAD}${GITEA_UPLOAD_FILENAME}-v${VERSION}.zip" \ - ${GITEA_URL_PUSH}?version=${VERSION}; + "${GITEA_URL_PUSH}"?version="${VERSION}"; echo "${VERSION}" > "${file_last_published}"; fi; else @@ -78,9 +79,9 @@ if [ ! -z "${GITEA_PUBLISH}" ]; then fi; # gitlab -if [ ! -z "${GITLAB_PUBLISH}" ]; then - if [ ! -z "${GITLAB_URL}" ] && [ ! -z "${GITLAB_DEPLOY_TOKEN}" ]; then - curl --data tag=v${VERSION} \ +if [ -n "${GITLAB_PUBLISH}" ]; then + if [ -n "${GITLAB_URL}" ] && [ -n "${GITLAB_DEPLOY_TOKEN}" ]; then + curl --data tag=v"${VERSION}" \ --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \ "${GITLAB_URL}"; curl --data branch=master \