Cleanout in outputs to log

backup-yunohost.sh

@@ -11,16 +11,13 @@ NUMRETAINBACKUPS=10
 
 echo "yunohost backup begin:" >$LOGFILE
 date >>$LOGFILE
-
+# delete max. 3 old backups per run
 for i in 1 2 3
 do
 	NUMBACKUPS=`ssh ${HOST} sudo yunohost backup list | grep -- '-' | wc -l`
 	ERR=$?
-	if [ ${ERR} == 0 ]
+	if [ ${ERR} -ne 0 ]
 	then
-	        echo number of backups on yunohost ${NUMBACKUPS} >>$LOGFILE
-       		echo number of backups to keep     ${NUMRETAINBACKUPS} >>$LOGFILE
-	else
         	echo yunohost could not list backups >>$LOGFILE
 		date >>$LOGFILE
 		exit 1
@@ -57,12 +54,12 @@ gzip -9 ${TARGET}/`basename ${BACKUPFILE}` >>$LOGFILE 2>&1
 
 
 cd ${TARGET}
-# keep 8 daily backups
-for i in {0..7}; do ((keep[$(date +%Y%m%d -d "-$i day")]++)); done
-# keep 5 weekly backups
-for i in {0..4}; do ((keep[$(date +%Y%m%d -d "sunday-$((i+1)) week")]++)); done
-# keep 13 monthly backups
-for i in {0..12}; do
+# keep 6 daily backups
+for i in {0..5}; do ((keep[$(date +%Y%m%d -d "-$i day")]++)); done
+# keep 3 weekly backups
+for i in {0..2}; do ((keep[$(date +%Y%m%d -d "sunday-$((i+1)) week")]++)); done
+# keep 11 monthly backups
+for i in {0..10}; do
         DW=$(($(date +%-W)-$(date -d $(date -d "$(date +%Y-%m-15) -$i month" +%Y-%m-01) +%-W)))
         for (( AY=$(date -d "$(date +%Y-%m-15) -$i month" +%Y); AY < $(date +%Y); AY++ )); do
                 ((DW+=$(date -d $AY-12-31 +%W)))