Cleanup output of cron_dump_to_disk example.

diff --git a/CHANGES b/CHANGES
index e3ce9a573ac94694afa05a3767198222fccae84f..b99fb6b1187137f66365d6827d2afceac503c54d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.290 2008/04/17 15:26:46 stelian Exp $
+$Id: CHANGES,v 1.291 2008/04/17 15:29:47 stelian Exp $

 
 Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
 =====================================================================
 
 Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
 =====================================================================


@@ -37,6 +37,10 @@ Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
        Thanks to Kenneth Porter <shiva@sewingwitch.com> for the bug
        report.
 
        Thanks to Kenneth Porter <shiva@sewingwitch.com> for the bug
        report.
 

+9.     Cleanup the output of the 'cron_dump_to_disk' example.
+       Thanks to Aaron S. Hawley <ashawley@users.sourceforge.net> for
+       the patch.
+

 Changes between versions 0.4b40 and 0.4b41 (released January 2, 2006)
 =====================================================================
 
 Changes between versions 0.4b40 and 0.4b41 (released January 2, 2006)
 =====================================================================
 

diff --git a/examples/cron_dump_to_disk/backup b/examples/cron_dump_to_disk/backup
index da6bda60965483a0750dcfc0cf39e2f515c40783..0cd319e9e93beb3823d9ba47a5942182b4d7849d 100755 (executable)
--- a/examples/cron_dump_to_disk/backup
+++ b/examples/cron_dump_to_disk/backup
@@ -51,27 +51,27 @@ echo
 #  Make full system backup
 #
 
 #  Make full system backup
 #
 

-echo "Phase 1: ### Full System Dump Backup ###"
-echo "Phase 1: Using backup partition: $BACKUPPART"
-echo "Phase 1: Filesystems to dump: $FSTODUMP"
+echo "### Full System Dump Backup ###"
+echo "Using backup partition: $BACKUPPART"
+echo "Filesystems to dump: $FSTODUMP"

 
 

-echo -n "Phase 1: Remounting backup partition read-write ... "
+echo -n "Remounting backup partition read-write ... "

 if ( mount $BACKUPPART -o remount,rw &> /dev/null ) then
    echo "done."
 else
    echo "failure!"
 if ( mount $BACKUPPART -o remount,rw &> /dev/null ) then
    echo "done."
 else
    echo "failure!"

-   echo "Phase 1:  There were problems remounting $BACKUPPART in read-write mode!"
-   echo "Phase 1: Aborting Full System Dump Backup."
-   echo "Phase 1: Aborted, done."
+   echo " There were problems remounting $BACKUPPART in read-write mode!"
+   echo "Aborting Full System Dump Backup."
+   echo "Aborted, done."

    echo "-------------------------------------------------------------------------------"
    exit 1
 fi
 
    echo "-------------------------------------------------------------------------------"
    exit 1
 fi
 

-echo -n "Phase 1: Checking backup partition for correct dir structure ... "
+echo -n "Checking backup partition for correct dir structure ... "

 if [ -d $BACKUPPART/$BACKUPDIR -a -w $BACKUPPART/$BACKUPDIR ]; then
    echo "done."
 
 if [ -d $BACKUPPART/$BACKUPDIR -a -w $BACKUPPART/$BACKUPDIR ]; then
    echo "done."
 

-   echo -n "Phase 1: Checking backup partition for available space ... "
+   echo -n "Checking backup partition for available space ... "

    SREQ=`for i in $FSTODUMP;do dump -$DLEVEL -S $i 2> /dev/null;done|awk '{x=x+$1/1048576} END {printf "%6.0f\n", x}'`
    SAVAILFREE=`df --block-size=1048576 |grep -Ew $BACKUPPART|awk '{printf "%6.0f\n", $4}'`
    SAVAILDEL=`du -s --block-size=1048576 $BACKUPPART/$BACKUPDIR/. |awk '{printf "%6.0f\n", $1}'`
    SREQ=`for i in $FSTODUMP;do dump -$DLEVEL -S $i 2> /dev/null;done|awk '{x=x+$1/1048576} END {printf "%6.0f\n", x}'`
    SAVAILFREE=`df --block-size=1048576 |grep -Ew $BACKUPPART|awk '{printf "%6.0f\n", $4}'`
    SAVAILDEL=`du -s --block-size=1048576 $BACKUPPART/$BACKUPDIR/. |awk '{printf "%6.0f\n", $1}'`


@@ -79,29 +79,29 @@ if [ -d $BACKUPPART/$BACKUPDIR -a -w $BACKUPPART/$BACKUPDIR ]; then
 
    if [ `expr $SAVAIL - $SREQ` -gt "0" ]; then
       echo "done."
 
    if [ `expr $SAVAIL - $SREQ` -gt "0" ]; then
       echo "done."

-      echo "Phase 1:  Available: $SAVAIL MB Required: $SREQ MB."
+      echo " Available: $SAVAIL MB Required: $SREQ MB."

    else
       echo "no enough space!"
    else
       echo "no enough space!"

-      echo "Phase 1:  There is not enough space left in $BACKUPPART for the backup!"
-      echo "Phase 1:  Available: $SAVAIL MB Required: $SREQ MB."
-      echo -n "Phase 1: Remounting backup partition read-only ... "
+      echo " There is not enough space left in $BACKUPPART for the backup!"
+      echo " Available: $SAVAIL MB Required: $SREQ MB."
+      echo -n "Remounting backup partition read-only ... "

       if ( mount $BACKUPPART -o remount,ro &> /dev/null ) then
          echo "done."
       else
          echo "failure!"
       if ( mount $BACKUPPART -o remount,ro &> /dev/null ) then
          echo "done."
       else
          echo "failure!"

-         echo "Phase 1:  There were problems remounting $BACKUPPART in read-only mode!"
-         echo "Phase 1: Aborting Full System Dump Backup."
-         echo "Phase 1: Aborted, done."
+         echo " There were problems remounting $BACKUPPART in read-only mode!"
+         echo "Aborting Full System Dump Backup."
+         echo "Aborted, done."

          echo "-------------------------------------------------------------------------------"
          exit 1
       fi
          echo "-------------------------------------------------------------------------------"
          exit 1
       fi

-      echo "Phase 1: Aborting Full System Dump Backup."
-      echo "Phase 1: Aborted, done."
+      echo "Aborting Full System Dump Backup."
+      echo "Aborted, done."

       echo "-------------------------------------------------------------------------------"
       exit 1
    fi
 
       echo "-------------------------------------------------------------------------------"
       exit 1
    fi
 

-   echo -n "Phase 1: Deleting old files ... "
+   echo -n "Deleting old files ... "

    if [ `ls -la $BACKUPPART/$BACKUPDIR/|wc -l` -gt "3" ]; then
       rm -f $BACKUPPART/$BACKUPDIR/* &> /dev/null
       echo "done."
    if [ `ls -la $BACKUPPART/$BACKUPDIR/|wc -l` -gt "3" ]; then
       rm -f $BACKUPPART/$BACKUPDIR/* &> /dev/null
       echo "done."


@@ -109,7 +109,7 @@ if [ -d $BACKUPPART/$BACKUPDIR -a -w $BACKUPPART/$BACKUPDIR ]; then
       echo "no old files to delete."
    fi
 
       echo "no old files to delete."
    fi
 

-   echo "Phase 1: Dumping filesystems ... "
+   echo "Dumping filesystems ... "

    for FS in $FSTODUMP
    do
       if [ "$FS" = "/" ]; then
    for FS in $FSTODUMP
    do
       if [ "$FS" = "/" ]; then


@@ -118,62 +118,62 @@ if [ -d $BACKUPPART/$BACKUPDIR -a -w $BACKUPPART/$BACKUPDIR ]; then
          FSNAME=`echo $FS|tr / _|cut -b 2-`
       fi
       sync
          FSNAME=`echo $FS|tr / _|cut -b 2-`
       fi
       sync

-      echo -n "Phase 1:  Starting dump of $FSNAME ( $FS ) ... "
+      echo -n " Starting dump of $FSNAME ( $FS ) ... "

       if ( dump -$DLEVEL $UPDATEDDATE -z -M -s 27306 -f $BACKUPPART/$BACKUPDIR/$FSNAME.$BTYPE. $FS &> $BACKUPPART/$BACKUPDIR/$FSNAME.log ) then
          echo "done."
       else
          echo "problems!"
       if ( dump -$DLEVEL $UPDATEDDATE -z -M -s 27306 -f $BACKUPPART/$BACKUPDIR/$FSNAME.$BTYPE. $FS &> $BACKUPPART/$BACKUPDIR/$FSNAME.log ) then
          echo "done."
       else
          echo "problems!"

-         echo "Phase 1:  There where problems with the dump of $FSNAME ( $FS )."
-         echo "Phase 1:  Check logfile $BACKUPPART/$BACKUPDIR/$FSNAME.log for more info"
-         echo "Phase 1:  Also check log archive file $DUMPLOGARCH."
+         echo " There where problems with the dump of $FSNAME ( $FS )."
+         echo " Check logfile $BACKUPPART/$BACKUPDIR/$FSNAME.log for more info"
+         echo " Also check log archive file $DUMPLOGARCH."

       fi
       cat $BACKUPPART/$BACKUPDIR/$FSNAME.log |gzip >> $DUMPLOGARCH
       echo "-------------------------------------------------------------------------------" |gzip >> $DUMPLOGARCH
    done
 
       fi
       cat $BACKUPPART/$BACKUPDIR/$FSNAME.log |gzip >> $DUMPLOGARCH
       echo "-------------------------------------------------------------------------------" |gzip >> $DUMPLOGARCH
    done
 

-   echo -n "Phase 1: Setting ownership and permissions of dump files ... "
+   echo -n "Setting ownership and permissions of dump files ... "

    chmod $DUMPFILESMODE $BACKUPPART/$BACKUPDIR/* $DUMPLOGARCH &> /dev/null
    chown $DUMPFILESOWN $BACKUPPART/$BACKUPDIR/* $DUMPLOGARCH &> /dev/null
    echo "done."
 
    chmod $DUMPFILESMODE $BACKUPPART/$BACKUPDIR/* $DUMPLOGARCH &> /dev/null
    chown $DUMPFILESOWN $BACKUPPART/$BACKUPDIR/* $DUMPLOGARCH &> /dev/null
    echo "done."
 

-   echo -n "Phase 1: Compressing dump log files ... "
+   echo -n "Compressing dump log files ... "

    gzip $BACKUPPART/$BACKUPDIR/*.log &> /dev/null
    echo "done."
    sync
 
 else
    echo "problems!"
    gzip $BACKUPPART/$BACKUPDIR/*.log &> /dev/null
    echo "done."
    sync
 
 else
    echo "problems!"

-   echo "Phase 1:  There are problems with the directory structure."
-   echo "Phase 1:  Check dirs: $BACKUPPART/$BACKUPDIR"
-   echo -n "Phase 1: Remounting backup partition read-only ... "
+   echo " There are problems with the directory structure."
+   echo " Check dirs: $BACKUPPART/$BACKUPDIR"
+   echo -n "Remounting backup partition read-only ... "

    if ( mount $BACKUPPART -o remount,ro &> /dev/null ) then
       echo "done."
    else
       echo "failure!"
    if ( mount $BACKUPPART -o remount,ro &> /dev/null ) then
       echo "done."
    else
       echo "failure!"

-      echo "Phase 1:  There were problems remounting $BACKUPPART in read-only mode!"
-      echo "Phase 1: Aborting Full System Dump Backup."
-      echo "Phase 1: Aborted, done."
+      echo " There were problems remounting $BACKUPPART in read-only mode!"
+      echo "Aborting Full System Dump Backup."
+      echo "Aborted, done."

       echo "-------------------------------------------------------------------------------"
       exit 1
    fi
       echo "-------------------------------------------------------------------------------"
       exit 1
    fi

-   echo "Phase 1: Aborting Full System Dump Backup."
-   echo "Phase 1: Aborted, done."
+   echo "Aborting Full System Dump Backup."
+   echo "Aborted, done."

    echo "-------------------------------------------------------------------------------"
    exit 1
 fi
 
    echo "-------------------------------------------------------------------------------"
    exit 1
 fi
 

-echo -n "Phase 1: Remounting backup partition read-only ... "
+echo -n "Remounting backup partition read-only ... "

 if ( mount $BACKUPPART -o remount,ro &> /dev/null ) then 
    echo "done."
 else
    echo "failure!"
 if ( mount $BACKUPPART -o remount,ro &> /dev/null ) then 
    echo "done."
 else
    echo "failure!"

-   echo "Phase 1:  There were problems remounting $BACKUPPART in read-only mode!"
-   echo "Phase 1: Aborting Full System Dump Backup."
-   echo "Phase 1: Aborted, done."
+   echo " There were problems remounting $BACKUPPART in read-only mode!"
+   echo "Aborting Full System Dump Backup."
+   echo "Aborted, done."

    echo "-------------------------------------------------------------------------------"
    exit 1
 fi
 
    echo "-------------------------------------------------------------------------------"
    exit 1
 fi
 

-echo "Phase 1: End of Full System Dump Backup."
-echo "Phase 1: Done."
+echo "End of Full System Dump Backup."
+echo "Done."

 echo "-------------------------------------------------------------------------------"
 echo "-------------------------------------------------------------------------------"