Fix app update script for macOS

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
This commit is contained in:
Jan-Christoph Borchardt 2019-05-17 22:49:33 +02:00
parent 8f0656aae9
commit fa066da77c
No known key found for this signature in database
GPG Key ID: CBD846FC845CBE17
2 changed files with 2 additions and 2 deletions

View File

@ -11,4 +11,4 @@
# - removes branches merged into master
# - … 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 && 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 git branch -d && cd ..' \;

View File

@ -9,7 +9,7 @@ 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 branch --merged master | grep -v "master$" | xargs git branch -d
git submodule update --init
# Update apps