From 459fe3916687b5762a003d1e42ba4a888e2eecc2 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Sat, 6 Jan 2018 11:00:49 +0100
Subject: nc-restore: restore to a btrfs subvolume

---
 changelog.md                           | 10 +++++++---
 etc/nextcloudpi-config.d/nc-restore.sh | 13 ++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/changelog.md b/changelog.md
index 9cdc9bf9..18818173 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,13 +1,17 @@
 
-[v0.44.6](https://github.com/nextcloud/nextcloudpi/commit/1b20f3d) (2018-01-05) nc-restore: restore compressed backups
+[v0.44.8](https://github.com/nextcloud/nextcloudpi/commit/e6fe1b6) (2018-01-06) nc-restore: restore to a btrfs subvolume
 
-[v0.44.5](https://github.com/nextcloud/nextcloudpi/commit/10fd204) (2018-01-04) nc-backup: compress backups and refactoring
+[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.5 ](https://github.com/nextcloud/nextcloudpi/commit/10fd204) (2018-01-04) nc-backup: compress backups and refactoring
 
 [v0.44.4 ](https://github.com/nextcloud/nextcloudpi/commit/56576da) (2018-01-03) nc-restore: update redis password
 
 [v0.44.3 ](https://github.com/nextcloud/nextcloudpi/commit/2a91f86) (2018-01-03) nc-export: protect file from read
 
-[v0.44.2](https://github.com/nextcloud/nextcloudpi/commit/9a18925) (2018-01-01) nc-snapshot: update btrfs-snp
+[v0.44.2 ](https://github.com/nextcloud/nextcloudpi/commit/9a18925) (2018-01-01) nc-snapshot: update btrfs-snp
 
 [v0.44.1 ](https://github.com/nextcloud/nextcloudpi/commit/5a80299) (2017-12-28) nc-snapshot: use btrfs-snp
 
diff --git a/etc/nextcloudpi-config.d/nc-restore.sh b/etc/nextcloudpi-config.d/nc-restore.sh
index fc2033d7..fd21846d 100644
--- a/etc/nextcloudpi-config.d/nc-restore.sh
+++ b/etc/nextcloudpi-config.d/nc-restore.sh
@@ -95,11 +95,18 @@ EOF
 
     [[ -e "$DATADIR" ]] && { 
       echo "backing up existing $DATADIR"
-      mv "$DATADIR" "$DATADIR-$( date "+%m-%d-%y" )" 
+      mv "$DATADIR" "$DATADIR-$( date "+%m-%d-%y" )" || return 1
     }
 
-    mkdir -p "$( dirname "$DATADIR" )"
-    mv "$TMPDIR/$( basename "$DATADIR" )" "$DATADIR"
+    mkdir -p "$DATADIR"
+    [[ "$( stat -fc%T "$DATADIR" )" == "btrfs" ]] && {
+      rmdir "$DATADIR"                  || return 1
+      btrfs subvolume create "$DATADIR" || return 1
+    }
+    chown www-data:www-data "$DATADIR"
+    local TMPDATA="$TMPDIR/$( basename "$DATADIR" )"
+    mv "$TMPDATA"/* "$TMPDATA"/.[!.]* "$DATADIR" || return 1
+    rmdir "$TMPDATA"                             || return 1
 
     sudo -u www-data php occ maintenance:mode --off
 
-- 
cgit v1.2.3