Indent fixes for publish script
This commit is contained in:
Clemens Schwaighofer
@@ -3,7 +3,7 @@
|
|||||||
BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
|
BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
|
||||||
PACKAGE_DOWNLOAD="${BASE_FOLDER}package-download/";
|
PACKAGE_DOWNLOAD="${BASE_FOLDER}package-download/";
|
||||||
if [ ! -d "${PACKAGE_DOWNLOAD}" ]; then
|
if [ ! -d "${PACKAGE_DOWNLOAD}" ]; then
|
||||||
mkdir "${PACKAGE_DOWNLOAD}";
|
mkdir "${PACKAGE_DOWNLOAD}";
|
||||||
fi;
|
fi;
|
||||||
VERSION=$(git tag --list | sort -V | tail -n1 | sed -e "s/^v//");
|
VERSION=$(git tag --list | sort -V | tail -n1 | sed -e "s/^v//");
|
||||||
file_last_published="${BASE_FOLDER}last.published";
|
file_last_published="${BASE_FOLDER}last.published";
|
||||||
@@ -11,84 +11,84 @@ go_flag="$1";
|
|||||||
|
|
||||||
function gitea_publish
|
function gitea_publish
|
||||||
{
|
{
|
||||||
_GITEA_PUBLISH="${1}"
|
_GITEA_PUBLISH="${1}"
|
||||||
_GITEA_UPLOAD_FILENAME="${2}"
|
_GITEA_UPLOAD_FILENAME="${2}"
|
||||||
_GITEA_URL_DL="${3}"
|
_GITEA_URL_DL="${3}"
|
||||||
_GITEA_URL_PUSH="${4}"
|
_GITEA_URL_PUSH="${4}"
|
||||||
_GITEA_USER="${5}"
|
_GITEA_USER="${5}"
|
||||||
_GITEA_TOKEN="${6}"
|
_GITEA_TOKEN="${6}"
|
||||||
_PACKAGE_DOWNLOAD="${7}"
|
_PACKAGE_DOWNLOAD="${7}"
|
||||||
_VERSION="${8}"
|
_VERSION="${8}"
|
||||||
_file_last_published="${9}"
|
_file_last_published="${9}"
|
||||||
|
|
||||||
if [ -z "${_GITEA_PUBLISH}" ]; then
|
if [ -z "${_GITEA_PUBLISH}" ]; then
|
||||||
return
|
return
|
||||||
fi;
|
fi;
|
||||||
if [ -n "${_GITEA_UPLOAD_FILENAME}" ] &&
|
if [ -n "${_GITEA_UPLOAD_FILENAME}" ] &&
|
||||||
[ -n "${_GITEA_URL_DL}" ] && [ -n "${_GITEA_URL_PUSH}" ] &&
|
[ -n "${_GITEA_URL_DL}" ] && [ -n "${_GITEA_URL_PUSH}" ] &&
|
||||||
[ -n "${_GITEA_USER}" ] && [ -n "${_GITEA_TOKEN}" ]; then
|
[ -n "${_GITEA_USER}" ] && [ -n "${_GITEA_TOKEN}" ]; then
|
||||||
echo "> Publish ${_GITEA_UPLOAD_FILENAME} with ${_VERSION} to: ${_GITEA_URL_PUSH}";
|
echo "> Publish ${_GITEA_UPLOAD_FILENAME} with ${_VERSION} to: ${_GITEA_URL_PUSH}";
|
||||||
if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
|
if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
|
||||||
echo "> Download: ${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip";
|
echo "> Download: ${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip";
|
||||||
curl -LJO \
|
curl -LJO \
|
||||||
--output-dir "${_PACKAGE_DOWNLOAD}" \
|
--output-dir "${_PACKAGE_DOWNLOAD}" \
|
||||||
"${_GITEA_URL_DL}"/v"${_VERSION}".zip;
|
"${_GITEA_URL_DL}"/v"${_VERSION}".zip;
|
||||||
fi;
|
fi;
|
||||||
if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
|
if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
|
||||||
echo "[!] Package file does not exist for version: ${_VERSION}";
|
echo "[!] Package file does not exist for version: ${_VERSION}";
|
||||||
else
|
else
|
||||||
response=$(curl --user "${_GITEA_USER}":"${_GITEA_TOKEN}" \
|
response=$(curl --user "${_GITEA_USER}":"${_GITEA_TOKEN}" \
|
||||||
--upload-file "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" \
|
--upload-file "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" \
|
||||||
"${_GITEA_URL_PUSH}"?version="${_VERSION}");
|
"${_GITEA_URL_PUSH}"?version="${_VERSION}");
|
||||||
status=$(echo "${response}" | jq .errors[].status);
|
status=$(echo "${response}" | jq .errors[].status);
|
||||||
message=$(echo "${response}" | jq .errors[].message);
|
message=$(echo "${response}" | jq .errors[].message);
|
||||||
if [ -n "${status}" ]; then
|
if [ -n "${status}" ]; then
|
||||||
echo "[!] Error ${status}: ${message}";
|
echo "[!] Error ${status}: ${message}";
|
||||||
else
|
else
|
||||||
echo "> Publish completed";
|
echo "> Publish completed";
|
||||||
fi;
|
fi;
|
||||||
echo "${_VERSION}" > "${_file_last_published}";
|
echo "${_VERSION}" > "${_file_last_published}";
|
||||||
fi;
|
fi;
|
||||||
else
|
else
|
||||||
echo "[!] Missing either GITEA_UPLOAD_FILENAME, GITEA_URL_DL, GITEA_URL_PUSH, GITEA_USER or GITEA_TOKEN environment variable";
|
echo "[!] Missing either GITEA_UPLOAD_FILENAME, GITEA_URL_DL, GITEA_URL_PUSH, GITEA_USER or GITEA_TOKEN environment variable";
|
||||||
fi;
|
fi;
|
||||||
}
|
}
|
||||||
|
|
||||||
function gitlab_publish
|
function gitlab_publish
|
||||||
{
|
{
|
||||||
_GITLAB_PUBLISH="${1}";
|
_GITLAB_PUBLISH="${1}";
|
||||||
_GITLAB_URL="${2}";
|
_GITLAB_URL="${2}";
|
||||||
_GITLAB_DEPLOY_TOKEN="${3}";
|
_GITLAB_DEPLOY_TOKEN="${3}";
|
||||||
_PACKAGE_DOWNLOAD="${4}"
|
_PACKAGE_DOWNLOAD="${4}"
|
||||||
_VERSION="${5}"
|
_VERSION="${5}"
|
||||||
_file_last_published="${6}"
|
_file_last_published="${6}"
|
||||||
if [ -z "${GITLAB_PUBLISH}" ]; then
|
if [ -z "${_GITLAB_PUBLISH}" ]; then
|
||||||
return;
|
return;
|
||||||
fi;
|
fi;
|
||||||
if [ -n "${_GITLAB_URL}" ] && [ -n "${_GITLAB_DEPLOY_TOKEN}" ]; then
|
if [ -n "${_GITLAB_URL}" ] && [ -n "${_GITLAB_DEPLOY_TOKEN}" ]; then
|
||||||
curl --data tag=v"${_VERSION}" \
|
curl --data tag=v"${_VERSION}" \
|
||||||
--header "Deploy-Token: ${_GITLAB_DEPLOY_TOKEN}" \
|
--header "Deploy-Token: ${_GITLAB_DEPLOY_TOKEN}" \
|
||||||
"${_GITLAB_URL}";
|
"${_GITLAB_URL}";
|
||||||
curl --data branch=master \
|
curl --data branch=master \
|
||||||
--header "Deploy-Token: ${_GITLAB_DEPLOY_TOKEN}" \
|
--header "Deploy-Token: ${_GITLAB_DEPLOY_TOKEN}" \
|
||||||
"${_GITLAB_URL}";
|
"${_GITLAB_URL}";
|
||||||
echo "${_VERSION}" > "${_file_last_published}";
|
echo "${_VERSION}" > "${_file_last_published}";
|
||||||
else
|
else
|
||||||
echo "[!] Missing GITLAB_URL or GITLAB_DEPLOY_TOKEN environment variable";
|
echo "[!] Missing GITLAB_URL or GITLAB_DEPLOY_TOKEN environment variable";
|
||||||
fi;
|
fi;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if [ -z "${VERSION}" ]; then
|
if [ -z "${VERSION}" ]; then
|
||||||
echo "[!] Version must be set in the form x.y.z without any leading characters";
|
echo "[!] Version must be set in the form x.y.z without any leading characters";
|
||||||
exit;
|
exit;
|
||||||
fi;
|
fi;
|
||||||
# compare version, if different or newer, deploy
|
# compare version, if different or newer, deploy
|
||||||
if [ -f "${file_last_published}" ]; then
|
if [ -f "${file_last_published}" ]; then
|
||||||
LAST_PUBLISHED_VERSION=$(cat "${file_last_published}");
|
LAST_PUBLISHED_VERSION=$(cat "${file_last_published}");
|
||||||
if dpkg --compare-versions "${VERSION}" le "${LAST_PUBLISHED_VERSION}"; then
|
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}";
|
echo "[!] git tag version ${VERSION} is not newer than previous published version ${LAST_PUBLISHED_VERSION}";
|
||||||
fi;
|
fi;
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
# read in the .env.deploy file and we must have
|
# read in the .env.deploy file and we must have
|
||||||
@@ -105,8 +105,8 @@ fi;
|
|||||||
# GITLAB_TOKEN
|
# GITLAB_TOKEN
|
||||||
# GITLAB_URL
|
# GITLAB_URL
|
||||||
if [ ! -f "${BASE_FOLDER}.env.deploy" ]; then
|
if [ ! -f "${BASE_FOLDER}.env.deploy" ]; then
|
||||||
echo "[!] Deploy enviroment file .env.deploy is missing";
|
echo "[!] Deploy enviroment file .env.deploy is missing";
|
||||||
exit;
|
exit;
|
||||||
fi;
|
fi;
|
||||||
set -o allexport;
|
set -o allexport;
|
||||||
cd "${BASE_FOLDER}" || exit
|
cd "${BASE_FOLDER}" || exit
|
||||||
@@ -116,10 +116,10 @@ cd - >/dev/null 2>&1 || exit;
|
|||||||
set +o allexport;
|
set +o allexport;
|
||||||
|
|
||||||
if [ "${go_flag}" != "go" ]; then
|
if [ "${go_flag}" != "go" ]; then
|
||||||
echo "[!] No go flag given";
|
echo "[!] No go flag given";
|
||||||
echo "> Would publish ${VERSION}";
|
echo "> Would publish ${VERSION}";
|
||||||
echo "[END]";
|
echo "[END]";
|
||||||
exit;
|
exit;
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
echo "[START]";
|
echo "[START]";
|
||||||
|
|||||||
Reference in New Issue
Block a user