octoleo/octojpack
3
3
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: octoleo:v1.3.4
Branches Tags
octoleo:master
octoleo:v1.3.7 octoleo:v1.3.6 octoleo:v1.3.5 octoleo:v1.3.4 octoleo:v1.3.2 octoleo:v1.3.1 octoleo:v1.3.0 octoleo:v1.0.1 octoleo:v1.0.0
...
compare: octoleo:v1.3.7
Branches Tags
octoleo:master
octoleo:v1.3.7 octoleo:v1.3.6 octoleo:v1.3.5 octoleo:v1.3.4 octoleo:v1.3.2 octoleo:v1.3.1 octoleo:v1.3.0 octoleo:v1.0.1 octoleo:v1.0.0

3 Commits
v1.3.4 ... v1.3.7

Author SHA1 Message Date
Llewellyn van der Merwe
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
Llewellyn van der Merwe
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
Llewellyn van der Merwe
288f45832c Update version to 1.3.5 and simplify Git URLs. 
Bumped the program version to 1.3.5. Replaced [ssh://] prefix in Git URLs with a simplified [git@] format for consistency and cleaner usage. This ensures uniformity across Git operations.
 2025-04-23 17:47:24 +02:00
1 changed files with 7 additions and 7 deletions
Expand all files Collapse all files

14
src/octojpack
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.4" PROGRAM_VERSION="1.3.7"
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 "ssh://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 getExistingRepository || return 23
update_repo=true update_repo=true
else else
@ -1009,11 +1009,11 @@ function setRepository() {
# move all new files into repository # move all new files into repository
setRepositoryNewFiles || return 27 setRepositoryNewFiles || return 27
# check if we have changes # 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" _echo "[info] No changes found in (${VDM_PACKAGE_OWNER}/${VDM_PACKAGE_REPO}) repository"
else else
# check if we must update or create repository # check if we must update or create repository
if $update_repo; then if [[ "${update_repo}" == true ]]; then
# make API call # make API call
callGiteaAPI "tags" "${VDM_PACKAGE_OWNER}" "${VDM_PACKAGE_REPO}" "${VDM_PACKAGE_API}" "${VDM_PACKAGE_TOKEN}" || return 28 callGiteaAPI "tags" "${VDM_PACKAGE_OWNER}" "${VDM_PACKAGE_REPO}" "${VDM_PACKAGE_API}" "${VDM_PACKAGE_TOKEN}" || return 28
# check if tag exists # check if tag exists
@ -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 "ssh://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}" "ssh://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 "ssh://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}"