2 Commits

Author SHA1 Message Date
f480b6f1f3 Update version to 1.3.7 and fix shell script logic handling
Incremented the program version to 1.3.7. Adjusted shell logic in repository handling for better compatibility and correctness by enforcing explicit boolean checks and improving syntax.
2025-04-23 20:22:24 +02:00
052353765d Update to version 1.3.6 and improve git repo check logic
Bump the program version from 1.3.5 to 1.3.6. Enhance the repository existence check by using the [--exit-code --heads] flags with [git ls-remote] for better validation.
2025-04-23 19:47:11 +02:00

View File

@ -3,7 +3,7 @@
# Program name
PROGRAM_NAME="Octojpack"
PROGRAM_CODE="octojpack"
PROGRAM_VERSION="1.3.5"
PROGRAM_VERSION="1.3.7"
PROGRAM_V="1.3"
PROGRAM_URL="https://git.vdm.dev/octoleo/${PROGRAM_CODE}"
@ -995,7 +995,7 @@ function setRepository() {
# check if the repository exist on our gitea instance
local update_repo
# shellcheck disable=SC2015
if git ls-remote "git@${VDM_PACKAGE_URL}/${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}.git" -q >/dev/null 2>&1; then
if git ls-remote --exit-code --heads "git@${VDM_PACKAGE_URL}:${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}.git" >/dev/null 2>&1; then
getExistingRepository || return 23
update_repo=true
else
@ -1009,11 +1009,11 @@ function setRepository() {
# move all new files into repository
setRepositoryNewFiles || return 27
# check if we have changes
if $update_repo && [[ -z $(git status --porcelain) ]]; then
if [[ "${update_repo}" == true && -z $(git status --porcelain) ]]; then
_echo "[info] No changes found in (${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}) repository"
else
# check if we must update or create repository
if $update_repo; then
if [[ "${update_repo}" == true ]]; then
# make API call
callGiteaAPI "tags" "${VDM_PACKAGE_OWNER}" "${VDM_PACKAGE_REPO}" "${VDM_PACKAGE_API}" "${VDM_PACKAGE_TOKEN}" || return 28
# check if tag exists
@ -1059,10 +1059,10 @@ function getExistingRepository() {
_echo "[info] Getting (${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}) repository"
if [[ "${VDM_PACKAGE_REPO_BRANCH}" == 'default' ]]; then
# clone the existing repository
git clone "git@${VDM_PACKAGE_URL}/${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}.git" >/dev/null 2>&1 || return 23
git clone "git@${VDM_PACKAGE_URL}:${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}.git" >/dev/null 2>&1 || return 23
else
# clone the existing repository
git clone -b "${VDM_PACKAGE_REPO_BRANCH:-master}" "git@${VDM_PACKAGE_URL}/${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}.git" >/dev/null 2>&1 || return 23
git clone -b "${VDM_PACKAGE_REPO_BRANCH:-master}" "git@${VDM_PACKAGE_URL}:${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}.git" >/dev/null 2>&1 || return 23
fi
# success
return 0
@ -1091,7 +1091,7 @@ function setGitRepository() {
# little information of progress
_echo "[info] Adding remote branch to (${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}) repository"
# add the remote branch
git remote add origin "git@${VDM_PACKAGE_URL}/${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}.git" >/dev/null 2>&1 || return 29
git remote add origin "git@${VDM_PACKAGE_URL}:${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}.git" >/dev/null 2>&1 || return 29
# Check if a specific branch is set and it is not 'default'
if [ "${VDM_PACKAGE_REPO_BRANCH}" != "default" ]; then
_echo "[info] Setting branch to ${VDM_PACKAGE_REPO_BRANCH}"