Skip to content
Snippets Groups Projects
Unverified Commit fa066da7 authored by Jan-Christoph Borchardt's avatar Jan-Christoph Borchardt
Browse files

Fix app update script for macOS

parent 8f0656aa
No related branches found
No related tags found
No related merge requests found
...@@ -11,4 +11,4 @@ ...@@ -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 && 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 ..' \;
...@@ -9,7 +9,7 @@ git checkout master ...@@ -9,7 +9,7 @@ git checkout master
git pull --quiet -p 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 git branch -d
git submodule update --init git submodule update --init
# Update apps # Update apps
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment