diff --git a/src/bin/git_pull.sh b/src/bin/git_pull.sh index bd52898..9eb7f2f 100755 --- a/src/bin/git_pull.sh +++ b/src/bin/git_pull.sh @@ -6,9 +6,9 @@ REPOSITORY="$1"; BRANCH="$2"; -REMOTE="$3"; -if [ -n "${REMOTE}" ]; then - REMOTE="origin" +REMOTE_NAME="$3"; +if [ -n "${REMOTE_NAME}" ]; then + REMOTE_NAME="origin" fi; BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/"; # shellcheck source=init.sh @@ -24,15 +24,15 @@ LOG_FILE="${GIT_WEBHOOK_BASE_FOLDER}${LOG_FOLDER}${REPOSITORY}.log"; # fetch to null # ${GIT_COMMAND} -C "${REPOSITORY_PATH}" fetch -q "${REMOTE}" "${BRANCH}"; -GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${REPOSITORY_PATH}" "fetch" "-q" "${REMOTE}" "${BRANCH}") +GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${REPOSITORY_PATH}" "fetch" "-q" "${REMOTE_NAME}" "${BRANCH}") "${GIT_COMMAND[@]}" -GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${REPOSITORY_PATH}" "diff" "--stat" "HEAD" "${REMOTE}/${BRANCH}") +GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${REPOSITORY_PATH}" "diff" "--stat" "HEAD" "${REMOTE_NAME}/${BRANCH}") # changes=$(${GIT_COMMAND_BASE} -C "${REPOSITORY_PATH}" diff --stat HEAD "${REMOTE}"/"${BRANCH}"); changes=$("${GIT_COMMAND[@]}") if [ -n "${changes}" ]; then echo "[$(date +"%Y-%m-%d %H:%M:%S")] Changes" &>> "$LOG_FILE"; # ${GIT_COMMAND_BASE} -C "/${REPOSITORY_PATH}" merge "${REMOTE}"/"${BRANCH}" - GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${REPOSITORY_PATH}" merge "${REMOTE}/${BRANCH}") + GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${REPOSITORY_PATH}" merge "${REMOTE_NAME}/${BRANCH}") "${GIT_COMMAND[@]}" &>> "$LOG_FILE"; echo "=[END]===>" &>> "$LOG_FILE"; fi;