diff options
author | nachoparker <nacho@ownyourbits.com> | 2019-01-11 20:41:33 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2019-01-12 20:55:05 +0300 |
commit | d21592c7d0185114943f4e3ed951d17f15a99a46 (patch) | |
tree | 1f331160f6fcff2dbdf9688fda70b2698478e649 | |
parent | da3c94933893e6b359b01b9609a376a79b083819 (diff) |
nc-update-nextcloud: only try to restore on reboot oncev1.1.3
-rw-r--r-- | bin/ncp-provisioning.sh | 4 | ||||
-rw-r--r-- | changelog.md | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/bin/ncp-provisioning.sh b/bin/ncp-provisioning.sh index 7316fa4b..ed79f665 100644 --- a/bin/ncp-provisioning.sh +++ b/bin/ncp-provisioning.sh @@ -56,7 +56,9 @@ run_app nc-limits BKP="$( ls -1t /var/www/nextcloud-bkp_*.tar.gz 2>/dev/null | head -1 )" [[ -f "$BKP" ]] && [[ "$( stat -c %U "$BKP" )" == "root" ]] && [[ "$( stat -c %a "$BKP" )" == 600 ]] && { echo "Detected interrupted upgrade. Restoring..." - ncp-restore "$BKP" && rm "$BKP" + BKP_NEW="failed_$BKP" + mv "$BKP" "$BKP_NEW" + ncp-restore "$BKP_NEW" && rm "$BKP_NEW" } exit 0 diff --git a/changelog.md b/changelog.md index cb333b85..78effa06 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v1.1.2](https://github.com/nextcloud/nextcloudpi/commit/57b26ef) (2019-01-10) ncp-web: fix section unselected when sidebar reloads +[v1.1.3](https://github.com/nextcloud/nextcloudpi/commit/42b74e0) (2019-01-11) nc-update-nextcloud: only try to restore on reboot once -[v1.1.1](https://github.com/nextcloud/nextcloudpi/commit/6ba0cb0) (2019-01-10) ncp-web: escape HTML in details box +[v1.1.2](https://github.com/nextcloud/nextcloudpi/commit/228c818) (2019-01-10) ncp-web: fix section unselected when sidebar reloads + +[v1.1.1 ](https://github.com/nextcloud/nextcloudpi/commit/6ba0cb0) (2019-01-10) ncp-web: escape HTML in details box [v1.1.0 ](https://github.com/nextcloud/nextcloudpi/commit/0ff1df9) (2019-01-08) upgrade to NC15 |