diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-01-07 18:30:51 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-01-07 18:31:19 +0300 |
| commit | 0972d575735a956550cf8fde89b43b22cb5798f1 (patch) | |
| tree | 54c5d3487c1369b437d7e7113d0246690180602c | |
| parent | 459fe3916687b5762a003d1e42ba4a888e2eecc2 (diff) | |
nc-restore: fix bug detecting datav0.44.9
| -rw-r--r-- | changelog.md | 6 | ||||
| -rw-r--r-- | etc/nextcloudpi-config.d/nc-restore.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/changelog.md b/changelog.md index 18818173..f9ae633e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,9 +1,11 @@ -[v0.44.8](https://github.com/nextcloud/nextcloudpi/commit/e6fe1b6) (2018-01-06) nc-restore: restore to a btrfs subvolume +[v0.44.9](https://github.com/nextcloud/nextcloudpi/commit/e37978b) (2018-01-07) nc-restore: fix bug detecting data + +[v0.44.8](https://github.com/nextcloud/nextcloudpi/commit/c42993d) (2018-01-06) nc-restore: restore to a btrfs subvolume [v0.44.7 ](https://github.com/nextcloud/nextcloudpi/commit/50513f6) (2018-01-06) nc-backup: make binary work standalone -[v0.44.6](https://github.com/nextcloud/nextcloudpi/commit/a4f27a2) (2018-01-05) nc-restore: restore compressed backups +[v0.44.6 ](https://github.com/nextcloud/nextcloudpi/commit/a4f27a2) (2018-01-05) nc-restore: restore compressed backups [v0.44.5 ](https://github.com/nextcloud/nextcloudpi/commit/10fd204) (2018-01-04) nc-backup: compress backups and refactoring diff --git a/etc/nextcloudpi-config.d/nc-restore.sh b/etc/nextcloudpi-config.d/nc-restore.sh index fd21846d..725545c0 100644 --- a/etc/nextcloudpi-config.d/nc-restore.sh +++ b/etc/nextcloudpi-config.d/nc-restore.sh @@ -86,7 +86,7 @@ EOF ### INCLUDEDATA=yes situation - if [[ $( ls "$TMPDIR" | wc -l ) == 3 ]]; then + if [[ $( ls "$TMPDIR" | wc -l ) == 2 ]]; then local DATADIR=$( grep datadirectory /var/www/nextcloud/config/config.php | awk '{ print $3 }' | grep -oP "[^']*[^']" | head -1 ) [[ "$DATADIR" == "" ]] && { echo "Error reading data directory"; return 1; } |