Merge branch 'master' of git.noarch.de:hardi/opt-cc into task/add-user-paging

backup/backup.sh

@@ -29,17 +29,15 @@ do
   fi
 done
 
-if [ $(ls -lt --hide=backup.sh | wc -l) -gt 6 ]; then
+if [ $(ls -lt --hide=backup.sh | wc -l) -gt 14 ]; then
     $(rm "$(ls -t --hide=backup.sh | tail -1)")
 fi
 
 if [ -z "$1" ]
   then
     tar -zcf ${DATE}.tar.gz ${DATE}
-fi
-
-# to avoid file deletion, if date to apply is entered with .tar.gz ending
-if [[ $1 =~ ^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$ ]]
+    rm -rf ${DATE}
+elif [[ $1 =~ ^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$ ]]
   then
     rm -rf ${DATE}
 fi