diff options
| author | nachoparker <nacho@ownyourbits.com> | 2019-03-19 04:51:22 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2019-03-19 04:51:29 +0300 |
| commit | 4b6572a113cbf44d4613bea79dcd2f74777a7221 (patch) | |
| tree | 94fcdb5bc798ca7c68bb7a315e8a01c956137eea | |
| parent | 9bafc9bbb9a4a4c908711e15682aaca27b925f70 (diff) | |
nc-update-nc: fix case where imported cfg from non docker to dockerv1.10.3
| -rwxr-xr-x | bin/ncp-update-nc | 4 | ||||
| -rw-r--r-- | changelog.md | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc index 7c44e6b4..de09bd39 100755 --- a/bin/ncp-update-nc +++ b/bin/ncp-update-nc @@ -146,10 +146,10 @@ done # copy data if it was at the default location #################### -[[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && { +if [[ "$DATADIR" == "/var/www/nextcloud/data" ]] || [[ "$DATADIR" == "/data/nextcloud/data" ]]; then echo "Restore data..." mv -T nextcloud-old/data nextcloud/data -} +fi # nc-restore if anything fails from here #################### diff --git a/changelog.md b/changelog.md index e93cd2f7..d6953e3f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v1.10.2](https://github.com/nextcloud/nextcloudpi/commit/f7baed0) (2019-03-16) freeDNS: fix hash +[v1.10.3](https://github.com/nextcloud/nextcloudpi/commit/925cf31) (2019-03-18) nc-update-nc: fix case where imported cfg from non docker to docker -[v1.10.1](https://github.com/nextcloud/nextcloudpi/commit/311ccc7) (2019-03-13) nc-update-nc-apps-auto: notify user +[v1.10.2 ](https://github.com/nextcloud/nextcloudpi/commit/ec66e40) (2019-03-16) freeDNS: fix hash + +[v1.10.1 ](https://github.com/nextcloud/nextcloudpi/commit/311ccc7) (2019-03-13) nc-update-nc-apps-auto: notify user [v1.10.0 ](https://github.com/nextcloud/nextcloudpi/commit/06073ed) (2019-03-13) add nc-previews-auto |