mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove eduplicate git fetch from update scripts 

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
This commit is contained in:
Jan-Christoph Borchardt 2019-05-15 12:38:53 +02:00
parent bc61b15e2f
commit 8f0656aae9
No known key found for this signature in database
GPG Key ID: CBD846FC845CBE17
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/update-apps.sh
View File

@ -11,4 +11,4 @@
# - removes branches merged into master # - removes branches merged into master
# - … could even do the build steps if they are consistent for the apps (like `make`) # - … could even do the build steps if they are consistent for the apps (like `make`)
find apps* -maxdepth 2 -name .git -exec sh -c 'cd {}/../ && printf "\n\033[1m${PWD##*/}\033[0m\n" && git checkout master && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged master | grep -v "master$" | xargs --no-run-if-empty git branch -d && git fetch --prune --quiet && cd ..' \; find apps* -maxdepth 2 -name .git -exec sh -c 'cd {}/../ && printf "\n\033[1m${PWD##*/}\033[0m\n" && git checkout master && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged master | grep -v "master$" | xargs --no-run-if-empty git branch -d && cd ..' \;

1
build/update.sh
View File

@ -10,7 +10,6 @@ git pull --quiet -p
git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s"
printf "\n" printf "\n"
git branch --merged master | grep -v "master$" | xargs --no-run-if-empty git branch -d git branch --merged master | grep -v "master$" | xargs --no-run-if-empty git branch -d
git fetch --prune --quiet
git submodule update --init git submodule update --init
# Update apps # Update apps