diff --git a/src/bin/git_pull.sh b/src/bin/git_pull.sh index 9eb7f2f..0ef1334 100755 --- a/src/bin/git_pull.sh +++ b/src/bin/git_pull.sh @@ -15,24 +15,26 @@ BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/"; . "${BASE_FOLDER}init.sh"; # check that repository path exists -REPOSITORY_PATH="${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}${REPOSITORY}"; -if [ ! -d "${REPOSITORY_PATH}$" ]; then +GIT_REPOSITORY_FOLDER="${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}${REPOSITORY}"; +if [ ! -d "${GIT_REPOSITORY_FOLDER}$" ]; then echo "[!] ${REPOSITORY} not found in clone folder"; + echo "[!] Full path: ${GIT_REPOSITORY_FOLDER}"; exit; fi; 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_NAME}" "${BRANCH}") +GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${GIT_REPOSITORY_FOLDER}" "fetch" "-q" "${REMOTE_NAME}" "${BRANCH}") "${GIT_COMMAND[@]}" -GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${REPOSITORY_PATH}" "diff" "--stat" "HEAD" "${REMOTE_NAME}/${BRANCH}") +# check diff +GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${GIT_REPOSITORY_FOLDER}" "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_NAME}/${BRANCH}") + GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${GIT_REPOSITORY_FOLDER}" merge "${REMOTE_NAME}/${BRANCH}") "${GIT_COMMAND[@]}" &>> "$LOG_FILE"; echo "=[END]===>" &>> "$LOG_FILE"; fi; diff --git a/src/bin/new_clone.sh b/src/bin/new_clone.sh index b4e30a1..2570fef 100755 --- a/src/bin/new_clone.sh +++ b/src/bin/new_clone.sh @@ -62,7 +62,6 @@ GIT_REPOSITORY_FOLDER=$(basename "${REPOSITORY}" .git); 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_NAME}" "${REMOTE_HOST}:${REPOSITORY}" "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}${GIT_REPOSITORY_FOLDER}") -echo "Command: ${GIT_COMMAND[*]}" -# "${GIT_COMMAND[@]}"; +"${GIT_COMMAND[@]}"; # __END__