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

Add a base setup script, update all other scripts with better command run

Browse Source 
Commands are set as array and run from them (array unbpack)
This commit is contained in:
Clemens Schwaighofer
2025-07-04 10:14:33 +09:00
parent 8d2731d555
commit 22d18ae4dd
4 changed files with 97 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bin/git_pull.sh
View File

@@ -1,6 +1,8 @@
#!/usr/bin/env bash
# fetch and merge from a remote repositry
# AUTHOR: Clemens Schwaighofer
# DATE: 2025/6/27
# DESC: fetch and merge from a remote repositry
REPOSITORY="$1";
BRANCH="$2";
@@ -8,7 +10,6 @@ REMOTE="$3";
if [ -n "${REMOTE}" ]; then
REMOTE="origin"
fi;
# BASE_FOLDER="${HOME}/tmp/git-clone/";
BASE_FOLDER=$(dirname "$(readlink -f "$0")")"/";
# shellcheck source=init.sh
. "${BASE_FOLDER}init.sh";
@@ -22,11 +23,17 @@ fi;
LOG_FILE="${GIT_REPOSITORY_FOLDER}${LOG_FOLDER}${REPOSITORY}.log";
# fetch to null
${GIT_COMMAND} -C "${REPOSITORY_PATH}" fetch -q "${REMOTE}" "${BRANCH}";
changes=$(${GIT_COMMAND} -C "${REPOSITORY_PATH}" diff --stat HEAD "${REMOTE}"/"${BRANCH}");
# ${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=("${GIT_COMMAND_BASE[@]}" "-C" "${REPOSITORY_PATH}" "diff" "--stat" "HEAD" "${REMOTE}/${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} -C "/${REPOSITORY_PATH}" merge "${REMOTE}"/"${BRANCH}"
# ${GIT_COMMAND_BASE} -C "/${REPOSITORY_PATH}" merge "${REMOTE}"/"${BRANCH}"
GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${REPOSITORY_PATH}" merge "${REMOTE}/${BRANCH}")
"${GIT_COMMAND[@]}" &>> "$LOG_FILE";
echo "=[END]===>" &>> "$LOG_FILE";
fi;