diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-02-05 22:13:32 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-02-05 22:14:12 +0300 |
| commit | 67b12bb9bea65bdee758f280286bf735fe4ec231 (patch) | |
| tree | 3a1955d3bb4bcdb721e2ecbadf9be115eab05a65 | |
| parent | 5452567300fe797f27d8e16e92499e8b4da6b27e (diff) | |
nc-backup: fixes in checking space and autov0.45.1
| -rw-r--r-- | changelog.md | 4 | ||||
| -rw-r--r-- | etc/nextcloudpi-config.d/nc-backup.sh | 2 | ||||
| -rwxr-xr-x | update.sh | 11 |
3 files changed, 9 insertions, 8 deletions
diff --git a/changelog.md b/changelog.md index e3ac26e7..e4e1af6a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v0.45.0](https://github.com/nextcloud/nextcloudpi/commit/645375f) (2018-02-03) update to NC 12.0.5 +[v0.45.1](https://github.com/nextcloud/nextcloudpi/commit/4cea878) (2018-02-05) nc-backup: fixes in checking space and auto + +[v0.45.0](https://github.com/nextcloud/nextcloudpi/commit/e229cba) (2018-02-03) update to NC 12.0.5 [v0.44.15](https://github.com/nextcloud/nextcloudpi/commit/3124d68) (2018-01-10) nc-init and samba: default to ncp user diff --git a/etc/nextcloudpi-config.d/nc-backup.sh b/etc/nextcloudpi-config.d/nc-backup.sh index 1f8cf3ac..8a8f42f5 100644 --- a/etc/nextcloudpi-config.d/nc-backup.sh +++ b/etc/nextcloudpi-config.d/nc-backup.sh @@ -41,7 +41,7 @@ DATADIR=$( cd "$BASEDIR"/nextcloud; sudo -u www-data php occ config:system:get d echo "check free space..." SIZE=$( du -s "$DATADIR" | awk '{ print $1 }' ) -FREE=$( df "$DATADIR" | tail -1 | awk '{ print $4 }' ) +FREE=$( df "$DESTDIR" | tail -1 | awk '{ print $4 }' ) [ $SIZE -ge $FREE ] && { echo "free space check failed. Need $( du -sh "$DATADIR" | awk '{ print $1 }' )"; @@ -195,17 +195,16 @@ y y EOF - # update btrfs-snp - grep -q "btrfs subvolume list" /usr/local/bin/btrfs-snp && { - wget https://raw.githubusercontent.com/nachoparker/btrfs-snp/master/btrfs-snp -O /usr/local/bin/btrfs-snp - chmod +x /usr/local/bin/btrfs-snp - } - # update ncp-backup cd /usr/local/etc/nextcloudpi-config.d &>/dev/null install_script nc-backup.sh cd - &>/dev/null + # update ncp-backup-auto + cd /usr/local/etc/nextcloudpi-config.d &>/dev/null + install_script nc-backup-auto.sh + cd - &>/dev/null + # refresh nc-backup-auto cd /usr/local/etc/nextcloudpi-config.d &>/dev/null grep -q '^ACTIVE_=yes$' nc-backup-auto.sh && activate_script nc-backup-auto.sh |