Use pigz for compression

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8d2b5a5add4b1df6dc76d2928447bbb039818d2..4d4aa17a01800a3898c9d14a9d73f85ed5ead3b7 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
 # Changelog
 

+## 2.1.2
+
+### General
+- User pigz for compression.
+

 ## 2.1.1
 
 ### Backup
 ## 2.1.1
 
 ### Backup

diff --git a/NextcloudBackup.sh b/NextcloudBackup.sh
index 2e8c62abbcc32b3e9f49ff0896fc4174d97e6257..3e0d2a5df099298278ad8b6c629fda9c10f14e34 100644 (file)
--- a/NextcloudBackup.sh
+++ b/NextcloudBackup.sh
@@ -3,7 +3,7 @@
 #
 # Bash script for creating backups of Nextcloud.
 #
 #
 # Bash script for creating backups of Nextcloud.
 #

-# Version 2.1.1
+# Version 2.1.2

 #
 # Usage:
 #      - With backup directory specified in the script:  ./NextcloudBackup.sh
 #
 # Usage:
 #      - With backup directory specified in the script:  ./NextcloudBackup.sh


@@ -173,7 +173,7 @@ echo
 echo "Creating backup of Nextcloud file directory..."
 
 if [ "$useCompression" = true ] ; then
 echo "Creating backup of Nextcloud file directory..."
 
 if [ "$useCompression" = true ] ; then

-       tar -cpzf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
+       tar -I pigz -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .

 else
        tar -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
 fi
 else
        tar -cpf "${backupdir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}" .
 fi


@@ -190,13 +190,13 @@ if [ "$ignoreUpdaterBackups" = true ] ; then
        echo "Ignoring updater backup directory"
 
        if [ "$useCompression" = true ] ; then
        echo "Ignoring updater backup directory"
 
        if [ "$useCompression" = true ] ; then

-               tar -cpzf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
+               tar -I pigz -cpf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .

        else
                tar -cpf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
        fi
 else
        if [ "$useCompression" = true ] ; then
        else
                tar -cpf "${backupdir}/${fileNameBackupDataDir}"  --exclude="updater-*/backups/*" -C "${nextcloudDataDir}" .
        fi
 else
        if [ "$useCompression" = true ] ; then

-        tar -cpzf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
+        tar -I pigz -cpf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .

        else
                tar -cpf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
        fi
        else
                tar -cpf "${backupdir}/${fileNameBackupDataDir}"  -C "${nextcloudDataDir}" .
        fi


@@ -210,7 +210,7 @@ echo
 #echo "Creating backup of Nextcloud local external storage directory..."
 
 #if [ "$useCompression" = true ] ; then
 #echo "Creating backup of Nextcloud local external storage directory..."
 
 #if [ "$useCompression" = true ] ; then

-#      tar -cpzf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .
+#      tar -I pigz -cpf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .

 #else
 #      tar -cpf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .
 #fi
 #else
 #      tar -cpf "${backupdir}/${fileNameBackupExternalDataDir}"  -C "${nextcloudLocalExternalDataDir}" .
 #fi

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index f12ab499091eeeec675083f76b795c270baed1c6..7f6bd0a0d2e5aa4bc653a86258f13d870f558030 100644 (file)
--- a/NextcloudRestore.sh
+++ b/NextcloudRestore.sh
@@ -3,7 +3,7 @@
 #
 # Bash script for restoring backups of Nextcloud.
 #
 #
 # Bash script for restoring backups of Nextcloud.
 #

-# Version 2.1.1
+# Version 2.1.2

 #
 # Usage:
 #   - With backup directory specified in the script: ./NextcloudRestore.sh <BackupName> (e.g. ./NextcloudRestore.sh 20170910_132703)
 #
 # Usage:
 #   - With backup directory specified in the script: ./NextcloudRestore.sh <BackupName> (e.g. ./NextcloudRestore.sh 20170910_132703)


@@ -182,7 +182,7 @@ echo
 echo "Restoring Nextcloud file directory..."
 
 if [ "$useCompression" = true ] ; then
 echo "Restoring Nextcloud file directory..."
 
 if [ "$useCompression" = true ] ; then

-    tar -xmpzf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
+    tar -I pigz -xmpf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"

 else
     tar -xmpf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
 fi
 else
     tar -xmpf "${currentRestoreDir}/${fileNameBackupFileDir}" -C "${nextcloudFileDir}"
 fi


@@ -194,7 +194,7 @@ echo
 echo "Restoring Nextcloud data directory..."
 
 if [ "$useCompression" = true ] ; then
 echo "Restoring Nextcloud data directory..."
 
 if [ "$useCompression" = true ] ; then

-    tar -xmpzf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
+    tar -I pigz -xmpf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"

 else
     tar -xmpf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
 fi
 else
     tar -xmpf "${currentRestoreDir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}"
 fi


@@ -207,7 +207,7 @@ echo
 #echo "Restoring Nextcloud data directory..."
 #
 #if [ "$useCompression" = true ] ; then
 #echo "Restoring Nextcloud data directory..."
 #
 #if [ "$useCompression" = true ] ; then

-#    tar -xmpzf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"
+#    tar -I pigz -xmpf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"

 #else
 #    tar -xmpf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"
 #fi
 #else
 #    tar -xmpf "${currentRestoreDir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}"
 #fi

diff --git a/setup.sh b/setup.sh
index 3556020ba69df4475317ed74371f2981164f5174..a9d9c4608f7a0fa93d0d4b93883ab1fb62a4c70a 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -3,7 +3,7 @@
 #
 # Bash script an easy setup of NextcloudBackup.sh and NextcloudRestore.sh
 #
 #
 # Bash script an easy setup of NextcloudBackup.sh and NextcloudRestore.sh
 #

-# Version 2.1.1
+# Version 2.1.2

 #
 # Usage:
 #      - call the setup.sh script
 #
 # Usage:
 #      - call the setup.sh script