Everbrent/cis
8
0
Fork 0
mirror of https://github.com/m8tin/cis.git synced 2026-08-01 11:47:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with tailing '/'

Browse Source
This commit is contained in:
m8in
2026-06-15 20:40:17 +02:00
parent b6fe890e74
commit 136c4a08f3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/addAndCheckGitRepository.sh
+7 -7
View File
@@ -13,12 +13,12 @@ function checkPermissions() {
readonly _FOLDER _RIGHTS readonly _FOLDER _RIGHTS
[ "${_RIGHTS}" == "readonly" ] \ [ "${_RIGHTS}" == "readonly" ] \
&& [ -d "${_FOLDER}/.git" ] \ && [ -d "${_FOLDER}.git" ] \
&& ! git -C "${_FOLDER}" push --dry-run &> /dev/null \ && ! git -C "${_FOLDER}" push --dry-run &> /dev/null \
&& return 0 && return 0
[ "${_RIGHTS}" == "writable" ] \ [ "${_RIGHTS}" == "writable" ] \
&& [ -d "${_FOLDER}/.git" ] \ && [ -d "${_FOLDER}.git" ] \
&& git -C "${_FOLDER}" push --dry-run &> /dev/null \ && git -C "${_FOLDER}" push --dry-run &> /dev/null \
&& return 0 && return 0
@@ -34,12 +34,12 @@ function cloneOrPull() {
_REPOSITORY="${2:?"Missing second parameter REPOSITORY"}" _REPOSITORY="${2:?"Missing second parameter REPOSITORY"}"
readonly _FOLDER _REPOSITORY readonly _FOLDER _REPOSITORY
[ -d "${_FOLDER}/.git" ] \ [ -d "${_FOLDER}.git" ] \
&& git -C "${_FOLDER}" pull &> /dev/null \ && git -C "${_FOLDER}" pull &> /dev/null \
&& return 0 && return 0
! [ -d "${_FOLDER}/.git" ] \ ! [ -d "${_FOLDER}.git" ] \
&& GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=accept-new" git clone "${_REPOSITORY}" "${_FOLDER}" &> /dev/null \ && GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=accept-new' git clone "${_REPOSITORY}" "${_FOLDER}" &> /dev/null \
&& return 0 && return 0
echo "FAIL: The local repository is not updatable: ("$(readlink -f ${0})")" >&2 echo "FAIL: The local repository is not updatable: ("$(readlink -f ${0})")" >&2
@@ -99,8 +99,8 @@ function addAndCheckGitRepository() {
} }
# sanitizes all parameters # sanitizes all parameters
base.set FOLDER "${1}" '^[-a-zA-Z0-9/:@._]*$' || exit 1 base.set FOLDER "${1}" '^[-a-zA-Z0-9/:@._]*/$' || exit 1
base.set RIGHTS "${2}" '^[-a-zA-Z0-9/:@._]*$' || exit 1 base.set RIGHTS "${2}" '^(readonly|writable)$' || exit 1
base.set SUGGESTED_REPOSITORY "${3}" '^([-a-zA-Z0-9/:@._]*)?$' || exit 1 base.set SUGGESTED_REPOSITORY "${3}" '^([-a-zA-Z0-9/:@._]*)?$' || exit 1
addAndCheckGitRepository \ addAndCheckGitRepository \
"${FOLDER:?"Missing FOLDER"}" \ "${FOLDER:?"Missing FOLDER"}" \