1 Commits

Author SHA1 Message Date
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
PROGRAM_NAME="Octojpack" PROGRAM_NAME="Octojpack"
PROGRAM_CODE="octojpack" PROGRAM_CODE="octojpack"
PROGRAM_VERSION="1.3.5" PROGRAM_VERSION="1.3.6"
PROGRAM_V="1.3" PROGRAM_V="1.3"
PROGRAM_URL="https://git.vdm.dev/octoleo/${PROGRAM_CODE}" PROGRAM_URL="https://git.vdm.dev/octoleo/${PROGRAM_CODE}"
@ -995,7 +995,7 @@ function setRepository() {
# check if the repository exist on our gitea instance # check if the repository exist on our gitea instance
local update_repo local update_repo
# shellcheck disable=SC2015 # 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" -q >/dev/null 2>&1; then
getExistingRepository || return 23 getExistingRepository || return 23
update_repo=true update_repo=true
else else
@ -1059,10 +1059,10 @@ function getExistingRepository() {
_echo "[info] Getting (${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}) repository" _echo "[info] Getting (${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}) repository"
if [[ "${VDM_PACKAGE_REPO_BRANCH}" == 'default' ]]; then if [[ "${VDM_PACKAGE_REPO_BRANCH}" == 'default' ]]; then
# clone the existing repository # 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 else
# clone the existing repository # 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 fi
# success # success
return 0 return 0
@ -1091,7 +1091,7 @@ function setGitRepository() {
# little information of progress # little information of progress
_echo "[info] Adding remote branch to (${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}) repository" _echo "[info] Adding remote branch to (${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}) repository"
# add the remote branch # 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' # Check if a specific branch is set and it is not 'default'
if [ "${VDM_PACKAGE_REPO_BRANCH}" != "default" ]; then if [ "${VDM_PACKAGE_REPO_BRANCH}" != "default" ]; then
_echo "[info] Setting branch to ${VDM_PACKAGE_REPO_BRANCH}" _echo "[info] Setting branch to ${VDM_PACKAGE_REPO_BRANCH}"