summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2019-05-17 22:49:33 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2019-05-17 22:49:39 +0200
commitfa066da77c7d56939ec1a73675c358cb782a56c6 (patch)
tree094adc3aadbdf31628f6862def8503b9ff7d85cd /build
parent8f0656aae9dabc256752914aa78761ea72fca575 (diff)
downloadnextcloud-server-fa066da77c7d56939ec1a73675c358cb782a56c6.tar.gz
nextcloud-server-fa066da77c7d56939ec1a73675c358cb782a56c6.zip
Fix app update script for macOS
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Diffstat (limited to 'build')
-rwxr-xr-xbuild/update-apps.sh2
-rwxr-xr-xbuild/update.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/update-apps.sh b/build/update-apps.sh
index 060cfe0fdca..e4611a79aff 100755
--- a/build/update-apps.sh
+++ b/build/update-apps.sh
@@ -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 ..' \;
diff --git a/build/update.sh b/build/update.sh
index ef4c7e3b76b..3a3d2eac5dc 100755
--- a/build/update.sh
+++ b/build/update.sh
@@ -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