From 9131916ca452fc0b2f1d6fa118f3871cf0c765af Mon Sep 17 00:00:00 2001 From: DecaTec Date: Sat, 27 Mar 2021 11:43:42 +0100 Subject: [PATCH 1/1] Use pigz for compression --- CHANGELOG.md | 5 +++++ NextcloudBackup.sh | 10 +++++----- NextcloudRestore.sh | 8 ++++---- setup.sh | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8d2b5a..4d4aa17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2.1.2 + +### General +- User pigz for compression. + ## 2.1.1 ### Backup diff --git a/NextcloudBackup.sh b/NextcloudBackup.sh index 2e8c62a..3e0d2a5 100644 --- a/NextcloudBackup.sh +++ b/NextcloudBackup.sh @@ -3,7 +3,7 @@ # # 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 @@ -173,7 +173,7 @@ echo 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 @@ -190,13 +190,13 @@ if [ "$ignoreUpdaterBackups" = 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 - tar -cpzf "${backupdir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}" . + tar -I pigz -cpf "${backupdir}/${fileNameBackupDataDir}" -C "${nextcloudDataDir}" . 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 -# tar -cpzf "${backupdir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}" . +# tar -I pigz -cpf "${backupdir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}" . #else # tar -cpf "${backupdir}/${fileNameBackupExternalDataDir}" -C "${nextcloudLocalExternalDataDir}" . #fi diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh index f12ab49..7f6bd0a 100644 --- a/NextcloudRestore.sh +++ b/NextcloudRestore.sh @@ -3,7 +3,7 @@ # # 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 (e.g. ./NextcloudRestore.sh 20170910_132703) @@ -182,7 +182,7 @@ echo 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 @@ -194,7 +194,7 @@ echo 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 @@ -207,7 +207,7 @@ echo #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 diff --git a/setup.sh b/setup.sh index 3556020..a9d9c46 100755 --- a/setup.sh +++ b/setup.sh @@ -3,7 +3,7 @@ # # 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 -- 2.34.1