4 files changed, 34 insertions, 4 deletions
diff --git a/build/package-lock.json b/build/package-lock.json
index 323ff50a609..71d7e3c3814 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -2659,9 +2659,9 @@
       "dev": true
     },
     "jsdoc": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.1.tgz",
-      "integrity": "sha512-mMMsst31b8c7/Z6ewnO6ORIdVMwsobg1enX9b/2XAzW8mM3KuMANRWcMD1KMBq91IAUMOIhC5NsXu7xvNQrRyQ==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.2.tgz",
+      "integrity": "sha512-S2vzg99C5+gb7FWlrK4TVdyzVPGGkdvpDkCEJH1JABi2PKzPeLu5/zZffcJUifgWUJqXWl41Hoc+MmuM2GukIg==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.4.4",
diff --git a/build/package.json b/build/package.json
index 8bed9352dc2..43652128ab4 100644
--- a/build/package.json
+++ b/build/package.json
@@ -14,7 +14,7 @@
     "handlebars": "^4.1.2",
     "jasmine-core": "~2.5.2",
     "jasmine-sinon": "^0.4.0",
-    "jsdoc": "^3.6.1",
+    "jsdoc": "^3.6.2",
     "karma": "^3.1.4",
     "karma-coverage": "*",
     "karma-jasmine": "^1.1.2",
diff --git a/build/update-apps.sh b/build/update-apps.sh
new file mode 100755
index 00000000000..e4611a79aff
--- /dev/null
+++ b/build/update-apps.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Update Nextcloud apps from latest git master
+# For local development environment
+# Use from Nextcloud server folder with `./build/update-apps.sh`
+#
+# It automatically:
+# - goes through all apps which are not shipped via server
+# - shows the app name in bold and uses whitespace for separation
+# - changes to master and pulls quietly
+# - shows the 3 most recent commits for context
+# - 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 git branch -d && cd ..' \;
diff --git a/build/update.sh b/build/update.sh
new file mode 100755
index 00000000000..3a3d2eac5dc
--- /dev/null
+++ b/build/update.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Update Nextcloud server and apps from latest git master
+# For local development environment
+# Use from Nextcloud server folder with `./build/update.sh`
+
+# Update server
+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
+git submodule update --init
+
+# Update apps
+source ./build/update-apps.sh