Correction du cas où on a des commits locaux donc le fetch indique quelque chose
Gestion de plusieurs dépôts par un script Changements utilitaires pour le wall
This commit is contained in:
parent
a26a4e5eaa
commit
27776d5a12
1 changed files with 60 additions and 54 deletions
|
@ -1,65 +1,71 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
export LC_ALL=POSIX
|
||||||
GIT_REPO="."
|
|
||||||
WORK_DIR=$HOME"/.gitAutoPull"
|
WORK_DIR=$HOME"/.gitAutoPull"
|
||||||
|
|
||||||
|
work_array="."
|
||||||
|
|
||||||
if [ $# -gt 0 ]; then
|
if [ $# -gt 0 ]; then
|
||||||
GIT_REPO="$1"
|
work_array=$@
|
||||||
fi
|
fi
|
||||||
|
|
||||||
GIT_REPO_NAME="$(echo '$GIT_REPO' | tr '/' '_' | tr -d '~')"
|
for GIT_REPO in $work_array ; do
|
||||||
CHECK_TIMER_FILE=$WORK_DIR/localCommitsCheck"$GIT_REPO_NAME"
|
|
||||||
|
|
||||||
cd $GIT_REPO > /dev/null
|
GIT_REPO_NAME="$(echo '$GIT_REPO' | tr '/' '_' | tr -d '~')"
|
||||||
|
CHECK_TIMER_FILE=$WORK_DIR/localCommitsCheck"$GIT_REPO_NAME"
|
||||||
|
|
||||||
if [ $? -ne 0 ]; then
|
cd $GIT_REPO > /dev/null
|
||||||
echo $GIT_REPO" Does not exist or is not a directory"
|
|
||||||
exit -2
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$(git rev-parse --git-dir 2>/dev/null)" ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo $GIT_REPO" is not a git repository"
|
echo $GIT_REPO" Does not exist or is not a directory"
|
||||||
exit -2
|
exit -2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d $WORK_DIR ]; then
|
if [ -z "$(git rev-parse --git-dir 2>/dev/null)" ]; then
|
||||||
mkdir $WORK_DIR > /dev/null
|
echo $GIT_REPO" is not a git repository"
|
||||||
fi
|
exit -2
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -d $WORK_DIR ]; then
|
if [ ! -d $WORK_DIR ]; then
|
||||||
echo "Could not create work directory, aborting"
|
mkdir $WORK_DIR > /dev/null
|
||||||
exit -4
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e $CHECK_TIMER_FILE ]; then
|
if [ ! -d $WORK_DIR ]; then
|
||||||
read count < $CHECK_TIMER_FILE
|
echo "Could not create work directory, aborting"
|
||||||
if [ $cout -ne 0 ]; then
|
exit -4
|
||||||
echo $(( $count - 1 )) > $CHECK_TIMER_FILE
|
fi
|
||||||
exit -1
|
|
||||||
|
if [ -e $CHECK_TIMER_FILE ]; then
|
||||||
|
read count < $CHECK_TIMER_FILE
|
||||||
|
if [ $cout -ne 0 ]; then
|
||||||
|
echo $(( $count - 1 )) > $CHECK_TIMER_FILE
|
||||||
|
exit -1
|
||||||
|
else
|
||||||
|
rm -f $CHECK_TIMER_FILE
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
remoteStatus="$(git fetch --dry-run 2>&1 | tail -n 1 | grep -v -e'+')" # Empty if there are no commits to fetch
|
||||||
|
localStatus="$(git push -n --porcelain | grep -e'up to date')" # Empty if there are commits to push
|
||||||
|
|
||||||
|
{
|
||||||
|
if [ -z "$remoteStatus" ]; then
|
||||||
|
if [ -z "$localStatus" ]; then
|
||||||
|
echo "Pushing "$GIT_REPO" updates to origin"
|
||||||
|
git push 2>&1
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
rm -f $CHECK_TIMER_FILE
|
if [ -z "localStatus" ]; then
|
||||||
fi
|
echo "Local and remote diverged, stopping auto-update for 30 iterations..."
|
||||||
fi
|
echo 30 > $WORK_DIR/localCommitsCheck"$GIT_REPO_NAME"
|
||||||
|
else
|
||||||
|
echo "Updating "$GIT_REPO" with remote commits"
|
||||||
|
git fetch --all 2>&1
|
||||||
|
git remote update 2>&1
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi } | wall
|
||||||
|
|
||||||
remoteStatus="$(git fetch --dry-run 2>&1)" # Empty if there are no commits to fetch
|
done
|
||||||
localStatus="$(git push -n --porcelain | grep -e'up to date')" # Empty if there are commits to push
|
|
||||||
|
|
||||||
if [ -z "$remoteStatus" ]; then
|
|
||||||
if [ -z "$localStatus" ]; then
|
|
||||||
echo "Pushing "$GIT_REPO" updates to origin" | wall
|
|
||||||
git push 2>&1 | wall
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ -z "localStatus" ]; then
|
|
||||||
echo "Local and remote diverged, stopping auto-update for 30 iterations..." | wall
|
|
||||||
echo 30 > $WORK_DIR/localCommitsCheck"$GIT_REPO_NAME"
|
|
||||||
else
|
|
||||||
echo "Updating "$GIT_REPO" with remote commits" | wall
|
|
||||||
git fetch --all 2>&1 | wall
|
|
||||||
git remote update 2>&1 | wall
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
exit 0
|
Loading…
Add table
Reference in a new issue