REMOTE name fixes for variables
This commit is contained in:
@@ -7,9 +7,9 @@
|
|||||||
REPOSITORY="$1";
|
REPOSITORY="$1";
|
||||||
BRANCH="$2";
|
BRANCH="$2";
|
||||||
REMOTE_HOST="$3";
|
REMOTE_HOST="$3";
|
||||||
REMOTE="$4";
|
REMOTE_NAME="$4";
|
||||||
if [ -n "${REMOTE}" ]; then
|
if [ -n "${REMOTE_NAME}" ]; then
|
||||||
REMOTE="origin"
|
REMOTE_NAME="origin"
|
||||||
fi;
|
fi;
|
||||||
BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
|
BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
|
||||||
# shellcheck source=init.sh
|
# shellcheck source=init.sh
|
||||||
@@ -27,11 +27,14 @@ fi;
|
|||||||
if [[ "${REPOSITORY}" == *":"* ]]; then
|
if [[ "${REPOSITORY}" == *":"* ]]; then
|
||||||
REPOSITORY=$(echo "${REPOSITORY}" | cut -d ":" -f 2);
|
REPOSITORY=$(echo "${REPOSITORY}" | cut -d ":" -f 2);
|
||||||
fi;
|
fi;
|
||||||
|
if [ $error -eq 1 ]; then
|
||||||
|
exit;
|
||||||
|
fi;
|
||||||
|
|
||||||
error=0
|
error=0
|
||||||
echo "* Validate SSH PEM Key exist and SSH config";
|
echo "* Validate SSH PEM Key exist and SSH config";
|
||||||
if ! grep "Host ${REMOTE}" "${GIT_WEBHOOK_BASE_FOLDER}"/.ssh/config; then
|
if ! grep "Host ${REMOTE_HOST}" "${GIT_WEBHOOK_BASE_FOLDER}"/.ssh/config; then
|
||||||
echo "ssh config entry for Host ${REMOTE} is missing";
|
echo "ssh config entry for Host ${REMOTE_HOST} is missing";
|
||||||
error=1;
|
error=1;
|
||||||
else
|
else
|
||||||
# make sure the identiy file is there
|
# make sure the identiy file is there
|
||||||
@@ -52,7 +55,7 @@ fi;
|
|||||||
GIT_REPOSITORY_FOLDER=$(basename "${REPOSITORY}" .git);
|
GIT_REPOSITORY_FOLDER=$(basename "${REPOSITORY}" .git);
|
||||||
|
|
||||||
echo "* New clone from ${REMOTE_HOST}:${REPOSITORY}/${BRANCH} into ${GIT_REPOSITORY_FOLDER}";
|
echo "* New clone from ${REMOTE_HOST}:${REPOSITORY}/${BRANCH} into ${GIT_REPOSITORY_FOLDER}";
|
||||||
GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "clone" "-b" "${BRANCH}" "--single-branch" "--depth" "1" "--origin" "${REMOTE}" "${REMOTE_HOST}:${REPOSITORY}" "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}")
|
GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "clone" "-b" "${BRANCH}" "--single-branch" "--depth" "1" "--origin" "${REMOTE_NAME}" "${REMOTE_HOST}:${REPOSITORY}" "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}")
|
||||||
echo "Command: ${GIT_COMMAND[*]}"
|
echo "Command: ${GIT_COMMAND[*]}"
|
||||||
# echo ${GIT_COMMAND_BASE} clone -b "${BRANCH}" --single-branch --depth 1 --origin "${REMOTE}" "${REMOTE_HOST}:${REPOSITORY}" "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}";
|
# echo ${GIT_COMMAND_BASE} clone -b "${BRANCH}" --single-branch --depth 1 --origin "${REMOTE}" "${REMOTE_HOST}:${REPOSITORY}" "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user