nc-backup: apply limit before backupv0.29.4

2 files changed, 24 insertions, 20 deletions

diff --git a/etc/nextcloudpi-config.d/nc-backup-auto.sh b/etc/nextcloudpi-config.d/nc-backup-auto.sh
index 6e3ff7fd..9d82925d 100644
--- a/etc/nextcloudpi-config.d/nc-backup-auto.sh
+++ b/etc/nextcloudpi-config.d/nc-backup-auto.sh
@@ -60,10 +60,22 @@ DATADIR=\$( cd $BASEDIR/nextcloud; sudo -u www-data php occ config:system:get da
 cd $BASEDIR/nextcloud
 sudo -u www-data php occ maintenance:mode --on
 
+# delete older backups
+[[ $BACKUPLIMIT_ != 0 ]] && {
+  NUMBKPS=\$( ls "$DESTDIR_"/nextcloud-bkp_* 2>/dev/null | wc -l )
+  [[ \$NUMBKPS -ge $BACKUPLIMIT_ ]] && \
+    ls -t $DESTDIR_/nextcloud-bkp_* | tail -\$(( NUMBKPS - $BACKUPLIMIT_ + 1 )) | while read f; do
+      echo -e "clean up old backup \$f"
+      rm \$f
+    done
+}
+
+# database
 cd $BASEDIR
 echo -e "backup database..."
 mysqldump -u root --single-transaction nextcloud > \$DBBACKUP
 
+# files
 [[ "$INCLUDEDATA_" == "yes" ]] && echo -e "backup datadir... "
 echo -e "backup files..."
 mkdir -p $DESTDIR_
@@ -90,16 +102,6 @@ tar -cf "\$DESTFILE" "\$DBBACKUP" nextcloud/ \
   } 
   echo -e "backup \$DESTFILE generated"
 
-# delete older backups
-[[ $BACKUPLIMIT_ != 0 ]] && {
-  NUMBKPS=\$( ls $DESTDIR_/nextcloud-bkp_* | wc -l )
-  [[ \$NUMBKPS > $BACKUPLIMIT_ ]] && \
-    ls -t $DESTDIR_/nextcloud-bkp_* | tail -\$(( NUMBKPS - $BACKUPLIMIT_ )) | while read f; do
-      echo -e "clean up old backup \$f"
-      rm \$f
-    done
-}
-
 cd $BASEDIR/nextcloud
 sudo -u www-data php occ maintenance:mode --off
 EOF
diff --git a/etc/nextcloudpi-config.d/nc-backup.sh b/etc/nextcloudpi-config.d/nc-backup.sh
index 528f4f21..8b95e53b 100644
--- a/etc/nextcloudpi-config.d/nc-backup.sh
+++ b/etc/nextcloudpi-config.d/nc-backup.sh
@@ -33,10 +33,22 @@ configure()
 
   sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --on
 
+  # delete older backups
+  [[ $BACKUPLIMIT_ != 0 ]] && {
+    local NUMBKPS=$( ls "$DESTDIR_"/nextcloud-bkp_* 2>/dev/null | wc -l )
+    [[ $NUMBKPS -ge $BACKUPLIMIT_ ]] && \
+      ls -t $DESTDIR_/nextcloud-bkp_* | tail -$(( NUMBKPS - BACKUPLIMIT_ + 1 )) | while read -r f; do
+        echo -e "clean up old backup $f"
+        rm "$f"
+      done
+  }
+
+  # database
   cd "$BASEDIR" || return 1
   echo -e "backup database..."
   mysqldump -u root --single-transaction nextcloud > "$DBBACKUP"
 
+  # files
   echo -e "backup base files..."
   mkdir -p "$DESTDIR_"
   tar -cf "$DESTFILE" "$DBBACKUP" nextcloud/ \
@@ -62,16 +74,6 @@ configure()
   } 
   echo -e "backup $DESTFILE generated"
 
-  # delete older backups
-  [[ $BACKUPLIMIT_ != 0 ]] && {
-    local NUMBKPS=$( ls "$DESTDIR_"/nextcloud-bkp_* | wc -l )
-    [[ $NUMBKPS > $BACKUPLIMIT_ ]] && \
-      ls -t $DESTDIR_/nextcloud-bkp_* | tail -$(( NUMBKPS - BACKUPLIMIT_ )) | while read -r f; do
-        echo -e "clean up old backup $f"
-        rm "$f"
-      done
-  }
-
   sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
 }