From 969aa684d9af73806e34c4a9bf3ece31071c888b Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Wed, 7 Jan 2026 12:50:37 +0900 Subject: [PATCH] Indent fixes for publish script --- publish/publish.sh | 146 ++++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/publish/publish.sh b/publish/publish.sh index 569b09d..f69e5ff 100755 --- a/publish/publish.sh +++ b/publish/publish.sh @@ -3,7 +3,7 @@ BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/"; PACKAGE_DOWNLOAD="${BASE_FOLDER}package-download/"; if [ ! -d "${PACKAGE_DOWNLOAD}" ]; then - mkdir "${PACKAGE_DOWNLOAD}"; + mkdir "${PACKAGE_DOWNLOAD}"; fi; VERSION=$(git tag --list | sort -V | tail -n1 | sed -e "s/^v//"); file_last_published="${BASE_FOLDER}last.published"; @@ -11,84 +11,84 @@ go_flag="$1"; function gitea_publish { - _GITEA_PUBLISH="${1}" - _GITEA_UPLOAD_FILENAME="${2}" - _GITEA_URL_DL="${3}" - _GITEA_URL_PUSH="${4}" - _GITEA_USER="${5}" - _GITEA_TOKEN="${6}" - _PACKAGE_DOWNLOAD="${7}" - _VERSION="${8}" - _file_last_published="${9}" + _GITEA_PUBLISH="${1}" + _GITEA_UPLOAD_FILENAME="${2}" + _GITEA_URL_DL="${3}" + _GITEA_URL_PUSH="${4}" + _GITEA_USER="${5}" + _GITEA_TOKEN="${6}" + _PACKAGE_DOWNLOAD="${7}" + _VERSION="${8}" + _file_last_published="${9}" - if [ -z "${_GITEA_PUBLISH}" ]; then - return - fi; - if [ -n "${_GITEA_UPLOAD_FILENAME}" ] && - [ -n "${_GITEA_URL_DL}" ] && [ -n "${_GITEA_URL_PUSH}" ] && - [ -n "${_GITEA_USER}" ] && [ -n "${_GITEA_TOKEN}" ]; then - echo "> Publish ${_GITEA_UPLOAD_FILENAME} with ${_VERSION} to: ${_GITEA_URL_PUSH}"; - if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then - echo "> Download: ${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip"; - curl -LJO \ - --output-dir "${_PACKAGE_DOWNLOAD}" \ - "${_GITEA_URL_DL}"/v"${_VERSION}".zip; - fi; - if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then - echo "[!] Package file does not exist for version: ${_VERSION}"; - else - response=$(curl --user "${_GITEA_USER}":"${_GITEA_TOKEN}" \ - --upload-file "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" \ - "${_GITEA_URL_PUSH}"?version="${_VERSION}"); - status=$(echo "${response}" | jq .errors[].status); - message=$(echo "${response}" | jq .errors[].message); - if [ -n "${status}" ]; then - echo "[!] Error ${status}: ${message}"; - else - echo "> Publish completed"; - fi; - echo "${_VERSION}" > "${_file_last_published}"; - fi; - else - echo "[!] Missing either GITEA_UPLOAD_FILENAME, GITEA_URL_DL, GITEA_URL_PUSH, GITEA_USER or GITEA_TOKEN environment variable"; - fi; + if [ -z "${_GITEA_PUBLISH}" ]; then + return + fi; + if [ -n "${_GITEA_UPLOAD_FILENAME}" ] && + [ -n "${_GITEA_URL_DL}" ] && [ -n "${_GITEA_URL_PUSH}" ] && + [ -n "${_GITEA_USER}" ] && [ -n "${_GITEA_TOKEN}" ]; then + echo "> Publish ${_GITEA_UPLOAD_FILENAME} with ${_VERSION} to: ${_GITEA_URL_PUSH}"; + if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then + echo "> Download: ${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip"; + curl -LJO \ + --output-dir "${_PACKAGE_DOWNLOAD}" \ + "${_GITEA_URL_DL}"/v"${_VERSION}".zip; + fi; + if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then + echo "[!] Package file does not exist for version: ${_VERSION}"; + else + response=$(curl --user "${_GITEA_USER}":"${_GITEA_TOKEN}" \ + --upload-file "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" \ + "${_GITEA_URL_PUSH}"?version="${_VERSION}"); + status=$(echo "${response}" | jq .errors[].status); + message=$(echo "${response}" | jq .errors[].message); + if [ -n "${status}" ]; then + echo "[!] Error ${status}: ${message}"; + else + echo "> Publish completed"; + fi; + echo "${_VERSION}" > "${_file_last_published}"; + fi; + else + echo "[!] Missing either GITEA_UPLOAD_FILENAME, GITEA_URL_DL, GITEA_URL_PUSH, GITEA_USER or GITEA_TOKEN environment variable"; + fi; } function gitlab_publish { - _GITLAB_PUBLISH="${1}"; - _GITLAB_URL="${2}"; - _GITLAB_DEPLOY_TOKEN="${3}"; - _PACKAGE_DOWNLOAD="${4}" - _VERSION="${5}" - _file_last_published="${6}" - if [ -z "${GITLAB_PUBLISH}" ]; then - return; - fi; - 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 \ - --header "Deploy-Token: ${_GITLAB_DEPLOY_TOKEN}" \ - "${_GITLAB_URL}"; - echo "${_VERSION}" > "${_file_last_published}"; - else - echo "[!] Missing GITLAB_URL or GITLAB_DEPLOY_TOKEN environment variable"; - fi; + _GITLAB_PUBLISH="${1}"; + _GITLAB_URL="${2}"; + _GITLAB_DEPLOY_TOKEN="${3}"; + _PACKAGE_DOWNLOAD="${4}" + _VERSION="${5}" + _file_last_published="${6}" + if [ -z "${_GITLAB_PUBLISH}" ]; then + return; + fi; + 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 \ + --header "Deploy-Token: ${_GITLAB_DEPLOY_TOKEN}" \ + "${_GITLAB_URL}"; + echo "${_VERSION}" > "${_file_last_published}"; + else + echo "[!] Missing GITLAB_URL or GITLAB_DEPLOY_TOKEN environment variable"; + fi; } if [ -z "${VERSION}" ]; then - echo "[!] Version must be set in the form x.y.z without any leading characters"; - exit; + echo "[!] Version must be set in the form x.y.z without any leading characters"; + exit; 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 - echo "[!] git tag version ${VERSION} is not newer than previous published version ${LAST_PUBLISHED_VERSION}"; - fi; + 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}"; + fi; fi; # read in the .env.deploy file and we must have @@ -105,8 +105,8 @@ fi; # GITLAB_TOKEN # GITLAB_URL if [ ! -f "${BASE_FOLDER}.env.deploy" ]; then - echo "[!] Deploy enviroment file .env.deploy is missing"; - exit; + echo "[!] Deploy enviroment file .env.deploy is missing"; + exit; fi; set -o allexport; cd "${BASE_FOLDER}" || exit @@ -116,10 +116,10 @@ cd - >/dev/null 2>&1 || exit; set +o allexport; if [ "${go_flag}" != "go" ]; then - echo "[!] No go flag given"; - echo "> Would publish ${VERSION}"; - echo "[END]"; - exit; + echo "[!] No go flag given"; + echo "> Would publish ${VERSION}"; + echo "[END]"; + exit; fi; echo "[START]";