diff options
| author | nachoparker <nacho@ownyourbits.com> | 2019-01-17 03:44:06 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2019-01-17 03:44:08 +0300 |
| commit | 84ac075831ce3379618556d274f7bc31acd04695 (patch) | |
| tree | 02d02d6ec04f5d003e20f553d8e90b31b3e3ef1f | |
| parent | 2419e578b600fa9d1905102bfc02aba39c1b8334 (diff) | |
nc-backup: parallel compressionv1.3.11
| -rw-r--r-- | bin/ncp/BACKUPS/nc-backup.sh | 7 | ||||
| -rw-r--r-- | bin/ncp/BACKUPS/nc-restore.sh | 4 | ||||
| -rw-r--r-- | changelog.md | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/bin/ncp/BACKUPS/nc-backup.sh b/bin/ncp/BACKUPS/nc-backup.sh index 96646f60..c3e48d6c 100644 --- a/bin/ncp/BACKUPS/nc-backup.sh +++ b/bin/ncp/BACKUPS/nc-backup.sh @@ -9,6 +9,9 @@ install() { + apt-get update + apt-get install -y --no-install-recommends pigz + cat > /usr/local/bin/ncp-backup <<'EOF' #!/bin/bash set -eE @@ -67,9 +70,9 @@ mysqldump -u root --single-transaction nextcloud > "$dbbackup" # files echo "backup files..." [[ "$includedata" == "yes" ]] && data="$(basename "$datadir")" -[[ "$compress" == "yes" ]] && z=z +[[ "$compress" == "yes" ]] && compress_arg="-I pigz" mkdir -p "$destdir" -tar -c${z}f "$destfile" \ +tar $compress_arg -cf "$destfile" \ \ "$dbbackup" \ \ diff --git a/bin/ncp/BACKUPS/nc-restore.sh b/bin/ncp/BACKUPS/nc-restore.sh index 38d175db..eaf36f98 100644 --- a/bin/ncp/BACKUPS/nc-restore.sh +++ b/bin/ncp/BACKUPS/nc-restore.sh @@ -40,8 +40,8 @@ rm -rf "$TMPDIR" && mkdir -p "$TMPDIR" # EXTRACT FILES echo "extracting backup file $BACKUPFILE..." -[[ "$BACKUPFILE" =~ ".tar.gz" ]] && z=z -tar -x${z}f "$BACKUPFILE" -C "$TMPDIR" || exit 1 +[[ "$BACKUPFILE" =~ ".tar.gz" ]] && compress_arg="-I pigz" +tar $compress_arg -xf "$BACKUPFILE" -C "$TMPDIR" || exit 1 ## SANITY CHECKS [[ -d "$TMPDIR"/nextcloud ]] && [[ -f "$( ls "$TMPDIR"/nextcloud-sqlbkp_*.bak 2>/dev/null )" ]] || { diff --git a/changelog.md b/changelog.md index 987a64f2..92c1e8bd 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v1.3.10](https://github.com/nextcloud/nextcloudpi/commit/b9fd429) (2019-01-15) nc-backup: compress in place and exclude previews folder +[v1.3.11](https://github.com/nextcloud/nextcloudpi/commit/418aa74) (2019-01-16) nc-backup: parallel compression -[v1.3.9](https://github.com/nextcloud/nextcloudpi/commit/0b8252b) (2019-01-15) build: add exfat utils for external storage +[v1.3.10](https://github.com/nextcloud/nextcloudpi/commit/2419e57) (2019-01-15) nc-backup: compress in place and exclude previews folder + +[v1.3.9 ](https://github.com/nextcloud/nextcloudpi/commit/0b8252b) (2019-01-15) build: add exfat utils for external storage [v1.3.8 ](https://github.com/nextcloud/nextcloudpi/commit/193d89b) (2019-01-14) nc-datadir: fix fail2ban logpath |