diff options
| author | nachoparker <nacho@ownyourbits.com> | 2017-11-10 19:27:37 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2017-11-10 20:14:20 +0300 |
| commit | 10488be24bdfb3940c02c53bfbe26334daead928 (patch) | |
| tree | 1cbffa07640bb7ecf6d662f78b14c186d029e347 | |
| parent | fa5f56e2e767ec4b31333007c808736171517391 (diff) | |
update: wait running apt processes (fix)v0.34.5
| -rw-r--r-- | build-devel.sh | 9 | ||||
| -rw-r--r-- | changelog.md | 12 |
2 files changed, 17 insertions, 4 deletions
diff --git a/build-devel.sh b/build-devel.sh index e37bf687..d8c0dd1d 100644 --- a/build-devel.sh +++ b/build-devel.sh @@ -17,7 +17,14 @@ # this is a replica of ncp-update, but from devel branch install() { - test -f /etc/apt/apt.conf.d/20nextcloudpi-upgrades && { echo "deactivate unattended upgrades first"; return 1; } + # wait for other apt processes + pgrep apt &>/dev/null && echo "waiting for apt processes to finish..." && \ + while :; do + pgrep apt &>/dev/null || break + sleep 1 + done + rm -f /etc/apt/apt.conf.d/20nextcloudpi-upgrades + echo -e "Downloading updates" rm -rf /tmp/ncp-update-tmp git clone --depth 20 -q -b devel https://github.com/nextcloud/nextcloudpi.git /tmp/ncp-update-tmp diff --git a/changelog.md b/changelog.md index b0289090..26af6ead 100644 --- a/changelog.md +++ b/changelog.md @@ -1,9 +1,15 @@ -[v0.34.2](https://github.com/nextcloud/nextcloudpi/commit/490c8fb) (2017-11-09) Revert "update: wait running apt processes" +[v0.34.5](https://github.com/nextcloud/nextcloudpi/commit/e603de3) (2017-11-10) update: wait running apt processes (fix) -[v0.34.1](https://github.com/nextcloud/nextcloudpi/commit/343c406) (2017-11-09) nc-nextcloud: added more logging +[v0.34.4 ](https://github.com/nextcloud/nextcloudpi/commit/362211f) (2017-11-09) redis: fixes with ramlogs and modsecurity -[v0.34.0 ](https://github.com/nextcloud/nextcloudpi/commit/bdf1b13) (2017-11-07) added NCP custom theme with new logo +[v0.34.3 ](https://github.com/nextcloud/nextcloudpi/commit/cc82c7b) (2017-11-09) redis: change overcommit memory on update + +[v0.34.2 ](https://github.com/nextcloud/nextcloudpi/commit/6552310) (2017-11-09) Revert "update: wait running apt processes" + +[v0.34.1 ](https://github.com/nextcloud/nextcloudpi/commit/3501a9e) (2017-11-09) nc-nextcloud: added more logging + +[v0.34.0 ](https://github.com/nextcloud/nextcloudpi/commit/6917cac) (2017-11-07) added NCP custom theme with new logo [v0.33.0 ](https://github.com/nextcloud/nextcloudpi/commit/d478a34) (2017-11-06) added redis |