Skip to content

Commit 4b6572a

Browse files
committed
nc-update-nc: fix case where imported cfg from non docker to docker
1 parent 9bafc9b commit 4b6572a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

bin/ncp-update-nc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@ done
146146

147147
# copy data if it was at the default location
148148
####################
149-
[[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && {
149+
if [[ "$DATADIR" == "/var/www/nextcloud/data" ]] || [[ "$DATADIR" == "/data/nextcloud/data" ]]; then
150150
echo "Restore data..."
151151
mv -T nextcloud-old/data nextcloud/data
152-
}
152+
fi
153153

154154
# nc-restore if anything fails from here
155155
####################

changelog.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

2-
[v1.10.2](https://github.com/nextcloud/nextcloudpi/commit/f7baed0) (2019-03-16) freeDNS: fix hash
2+
[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
33

4-
[v1.10.1](https://github.com/nextcloud/nextcloudpi/commit/311ccc7) (2019-03-13) nc-update-nc-apps-auto: notify user
4+
[v1.10.2 ](https://github.com/nextcloud/nextcloudpi/commit/ec66e40) (2019-03-16) freeDNS: fix hash
5+
6+
[v1.10.1 ](https://github.com/nextcloud/nextcloudpi/commit/311ccc7) (2019-03-13) nc-update-nc-apps-auto: notify user
57

68
[v1.10.0 ](https://github.com/nextcloud/nextcloudpi/commit/06073ed) (2019-03-13) add nc-previews-auto
79

0 commit comments

Comments
 (0)