Rename “daglig” backup to “daily”.

diff --git a/backup.sh b/backup.sh
index b808d5611e49636cec8adf41705ab2f7b6aaac01..dfe8d45564859a4cc317814404d78e8cd44c00a3 100755 (executable)
--- a/backup.sh
+++ b/backup.sh
@@ -90,7 +90,7 @@ backup()
 
        localsnar="${storagedir}/${computer}/${sfilesystem}/.incremental.snar"
        remotesnar="$remotehome/.backup/${sfilesystem}.snar"
-       if [ "$backuplevel" = "daglig" ]; then
+       if [ "$backuplevel" = "daily" ]; then
                # If incremental backup, we need to copy the incremental status to $computer.
                # If it does not exist, whine a bit and then run date-based instead.
                if [ -s "$localsnar" ]; then
@@ -177,7 +177,7 @@ nonprivbackup()
 {
        infomsg "$computer:$filesystem $backuplevel non-privileged backup"
 
-       if [ "$backuplevel" = "daglig" ]; then
+       if [ "$backuplevel" = "daily" ]; then
                lastd=`cat ../.date`
                lastcmd="'$lastd'"
        else
@@ -292,10 +292,10 @@ for filesystem in $filesystems; do
 
        # Prepare storage area
        mkdir -m 755 -p $storagedir/$computer/$sfilesystem/full 2>/dev/null
-       mkdir -m 755 -p $storagedir/$computer/$sfilesystem/daglig 2>/dev/null
+       mkdir -m 755 -p $storagedir/$computer/$sfilesystem/daily 2>/dev/null
 
        # Default backuplevel
-       backuplevel=daglig
+       backuplevel=daily
 
        if [ ! -s $storagedir/$computer/$sfilesystem/.date ]; then
                # Take the first full backup of this filesystem on this computer
@@ -339,7 +339,7 @@ for filesystem in $filesystems; do
        # Delete incremental backups older than the oldest full backup
        oldf=`ls -t1 $storagedir/$computer/$sfilesystem/full/*tgz* | tail -1`
        find \
-               $storagedir/$computer/$sfilesystem/daglig \
+               $storagedir/$computer/$sfilesystem/daily \
                -type f \
                \! -newer $oldf \
                -printf "`date`: $computer: Deleting old incremental backup: %p\n" \

diff --git a/list-incr.sh b/list-incr.sh
index 8bf99bf813d889d053004c9d387cdbc90b5e9792..71ce781a2ff391f3783a10d9c7d7e8ffb83834cf 100755 (executable)
--- a/list-incr.sh
+++ b/list-incr.sh
@@ -10,4 +10,4 @@ fi
 # Get timestamp on form 2012-10-15 00:16
 LASTFULL_TIMESTAMP=$(echo `basename $LASTFULL .tgz` | sed -re 's/^([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}).*/\1-\2-\3 \4:\5/')
 find $DIR/full/$LASTFULL
-find $DIR/daglig -newermt "$LASTFULL_TIMESTAMP" -name '*.tgz'
+find $DIR/daily -newermt "$LASTFULL_TIMESTAMP" -name '*.tgz'