nc-update-nc: fix case where imported cfg from non docker to docker

nextcloud · Mar 19, 2019 · 4b6572a · 4b6572a
1 parent 9bafc9b
commit 4b6572a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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