change: date diff and date formatierung

diff --git a/backup b/backup
index f982394c1bef046fcae70ba4b7dc8ce29bbaf1e1..66675c9a40a02da755d216513c6b76eea8f13a2e 100755 (executable)
--- a/backup
+++ b/backup
@@ -73,11 +73,11 @@ CreateBackupFolder()
        local dayAnzahl=1
        local fullnum=$(printf "%02d" $dayAnzahl)
 
-       backDir="$(date +%Y-%m-%d)"_"$fullnum"_"$backname"
+       backDir="$(date +%F)"_"$fullnum"_"$backname"
        while [ -d $backpath/$backDir ]; do
                ((dayAnzahl++))
                fullnum=$(printf "%02d" $dayAnzahl)
-               backDir="$(date +%Y-%m-%d)"_"$fullnum"_"$backname"
+               backDir="$(date +%F)"_"$fullnum"_"$backname"
        done
 
        tmpordner=$(find $backpath -maxdepth 1 -type d -name "*_"$backname"" \
@@ -316,21 +316,21 @@ CleanUpBackups()
 MakeHistory()
 {
        if [ -f "$backpath/day" ]; then
-               echo "$(date +%Y-%m-%d)" > $backpath/day
-               echo "$(date +%Y-%m-%d)" > day
-               echo "$(date +%Y-%m-%d) day" >> backuphistory
+               echo "$(date +%F)" > $backpath/day
+               echo "$(date +%F)" > day
+               echo "$(date +%F) day" >> backuphistory
        elif [ -f "$backpath/week" ]; then
-               echo "$(date +%Y-%m-%d)" > $backpath/week
-               echo "$(date +%Y-%m-%d)" > week
-               echo "$(date +%Y-%m-%d) week" >> backuphistory
+               echo "$(date +%F)" > $backpath/week
+               echo "$(date +%F)" > week
+               echo "$(date +%F) week" >> backuphistory
        elif [ -f "$backpath/month" ]; then
-               echo "$(date +%Y-%m-%d)" > $backpath/month
-               echo "$(date +%Y-%m-%d)" > month
-               echo "$(date +%Y-%m-%d) month" >> backuphistory
+               echo "$(date +%F)" > $backpath/month
+               echo "$(date +%F)" > month
+               echo "$(date +%F) month" >> backuphistory
        else
-               echo "$(date +%Y-%m-%d)" > $backpath/none
-               echo "$(date +%Y-%m-%d)" > none
-               echo "$(date +%Y-%m-%d) none" >> backuphistory
+               echo "$(date +%F)" > $backpath/none
+               echo "$(date +%F)" > none
+               echo "$(date +%F) none" >> backuphistory
        fi
 
 }
@@ -361,8 +361,8 @@ CheckBackupDate()
 IsBackupOld()
 {
        local readonly backup="$1"
-       local readonly datum="$2"
-       local readonly diff=$(dateutils.ddiff now $datum)
+       local readonly diff=$(( ($(date --date="$2" +%s) - $(date +%s))
+                               / 86400 ))
 
        case "$backup" in
        "day")
@@ -376,7 +376,7 @@ IsBackupOld()
                fi
                ;;
        "month")
-               if [ $diff -le -30 ]; then
+               if [ "$(date --date="$datum" '+%m')" != "$(date '+%m')" ]; then
                        echo 1
                fi
                ;;