X-Git-Url: https://git.p6c8.net/nextcloud-backup-restore.git/blobdiff_plain/343e0030aec4e9213a9d432580197510d1f008be..001bec529747e994540cbace860016591a323e33:/NextcloudRestore.sh

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index 90ec545..f12ab49 100644
--- a/NextcloudRestore.sh
+++ b/NextcloudRestore.sh
@@ -3,7 +3,7 @@
 #
 # Bash script for restoring backups of Nextcloud.
 #
-# Version 2.0.0
+# Version 2.1.1
 #
 # Usage:
 #   - With backup directory specified in the script: ./NextcloudRestore.sh <BackupName> (e.g. ./NextcloudRestore.sh 20170910_132703)
@@ -29,6 +29,9 @@ fi
 
 echo "Backup directory: $backupMainDir"
 
+# TODO: Set this to true, if the backup was created with compression enabled, otherwiese false.
+useCompression=true
+
 currentRestoreDir="${backupMainDir}/${restore}"
 
 # TODO: The directory of your Nextcloud installation (this is a directory under your web root)
@@ -62,11 +65,20 @@ dbPassword='mYpAsSw0rd'
 
 # File names for backup files
 # If you prefer other file names, you'll also have to change the NextcloudBackup.sh script.
-fileNameBackupFileDir='nextcloud-filedir.tar.gz'
-fileNameBackupDataDir='nextcloud-datadir.tar.gz'
+fileNameBackupFileDir='nextcloud-filedir.tar'
+fileNameBackupDataDir='nextcloud-datadir.tar'
+
+if [ "$useCompression" = true ] ; then
+    fileNameBackupFileDir='nextcloud-filedir.tar.gz'
+    fileNameBackupDataDir='nextcloud-datadir.tar.gz'
+fi
 
 # TODO: Uncomment if you use local external storage
-#fileNameBackupExternalDataDir='nextcloud-external-datadir.tar.gz'
+#fileNameBackupExternalDataDir='nextcloud-external-datadir.tar'
+#
+#if [ "$useCompression" = true ] ; then
+#    fileNameBackupExternalDataDir='nextcloud-external-datadir.tar.gz'
+#fi
 
 fileNameBackupDb='nextcloud-db.sql'
 
@@ -168,20 +180,38 @@ echo
 
 # File directory
 echo "Restoring Nextcloud file directory..."
-tar -xmpzf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
+
+if [ "$useCompression" = true ] ; then
+    tar -xmpzf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
+else
+    tar -xmpf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
+fi
+
 echo "Done"
 echo
 
 # Data directory
 echo "Restoring Nextcloud data directory..."
-tar -xmpzf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
+
+if [ "$useCompression" = true ] ; then
+    tar -xmpzf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
+else
+    tar -xmpf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
+fi
+
 echo "Done"
 echo
 
 # Local external storage
 # TODO: Uncomment if you use local external storage
 #echo "Restoring Nextcloud data directory..."
-#tar -xmpzf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"
+#
+#if [ "$useCompression" = true ] ; then
+#    tar -xmpzf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"
+#else
+#    tar -xmpf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"
+#fi
+#
 #echo "Done"
 #echo