ScriptsCollections/GitHub.webhook-scripts
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add help and fix problem with Host name set for new clone

Browse Source 
The host name ise set as ssh config entry with ssh key, so we use the short name set for the remote host name
This commit is contained in:
Clemens Schwaighofer
2025-11-17 11:12:54 +09:00
parent 329f3abb6b
commit 61569672bb
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/create_ssh_config.sh
View File

@@ -13,6 +13,10 @@
REPOSITORY="$1"; REPOSITORY="$1";
JUMP_PROXY="$2"; JUMP_PROXY="$2";
if [ "${REPOSITORY}" == "--help" ]; then
echo "$0 <Repo.git> [<Jump Proxy>]";
exit;
fi;
# below are only to skip error # below are only to skip error
BRANCH="-" BRANCH="-"

4
src/bin/git_sync.sh
View File

@@ -7,6 +7,10 @@
REPOSITORY="$1"; REPOSITORY="$1";
BRANCH="$2"; BRANCH="$2";
REMOTE_NAME="$3"; REMOTE_NAME="$3";
if [ "${REPOSITORY}" == "--help" ]; then
echo "$0 <Repo.git> <branch> [<remote name, defaults to origin>]";
exit;
fi;
if [ -z "${REMOTE_NAME}" ]; then if [ -z "${REMOTE_NAME}" ]; then
REMOTE_NAME="origin" REMOTE_NAME="origin"
fi; fi;

21
src/bin/new_clone.sh
View File

@@ -11,6 +11,10 @@ BRANCH="$2";
REMOTE_HOST="$3"; REMOTE_HOST="$3";
REPOSITORY_FOLDER="$4" REPOSITORY_FOLDER="$4"
REMOTE_NAME="$5"; REMOTE_NAME="$5";
if [ "${REPOSITORY}" == "--help" ]; then
echo "$0 <Repo.git> <branch> [<override host>] [<target folder>] [<remote name, defaults to origin>]";
exit;
fi;
if [ -z "${REMOTE_NAME}" ]; then if [ -z "${REMOTE_NAME}" ]; then
REMOTE_NAME="origin" REMOTE_NAME="origin"
fi; fi;
@@ -22,15 +26,6 @@ if [ -z "${REPOSITORY}" ]; then
echo "[!] Must set a repository path"; echo "[!] Must set a repository path";
error=1; error=1;
fi; fi;
# if remote host is empty try to set from repository
if [ -z "${REMOTE_HOST}" ]; then
if [[ "${REPOSITORY}" == *":"* ]]; then
REMOTE_HOST=$(echo "${REPOSITORY}" | cut -d ":" -f 1);
else
echo "[!] Must set a repository path with remote host for the repository";
error=1;
fi;
fi;
# if we have an ":" in the repository, split by it and replace it with the remote host # if we have an ":" in the repository, split by it and replace it with the remote host
if [[ "${REPOSITORY}" == *":"* ]]; then if [[ "${REPOSITORY}" == *":"* ]]; then
REPOSITORY=$(echo "${REPOSITORY}" | cut -d ":" -f 2); REPOSITORY=$(echo "${REPOSITORY}" | cut -d ":" -f 2);
@@ -41,14 +36,18 @@ if [ -z "${REPOSITORY_FOLDER}" ]; then
else else
GIT_REPOSITORY_NAME="${REPOSITORY_FOLDER}"; GIT_REPOSITORY_NAME="${REPOSITORY_FOLDER}";
fi; fi;
# set remote host if not set to the ssh config name
if [ -z "${REMOTE_HOST}" ]; then
REMOTE_HOST="${GIT_REPOSITORY_NAME}";
fi;
if [ $error -eq 1 ]; then if [ $error -eq 1 ]; then
exit; exit;
fi; 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 ${GIT_REPOSITORY_NAME}" "${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 ${GIT_REPOSITORY_NAME} 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

4
src/bin/switch_branch.sh
View File

@@ -8,6 +8,10 @@
REPOSITORY="$1"; REPOSITORY="$1";
BRANCH="$2"; BRANCH="$2";
REMOTE_NAME="$3"; REMOTE_NAME="$3";
if [ "${REPOSITORY}" == "--help" ]; then
echo "$0 <Repo.git> <branch> [<remote name, defaults to origin>]";
exit;
fi;
if [ -z "${REMOTE_NAME}" ]; then if [ -z "${REMOTE_NAME}" ]; then
REMOTE_NAME="origin" REMOTE_NAME="origin"
fi; fi;