Bugfixes.

[chaz/tar] / scripts / backup.in

diff --git a/scripts/backup.in b/scripts/backup.in
index 7baa4a05e6e98a68f2adcced86a23934896e3e8a..d64f2fa00d5d5174803bfcea4a98656edcebc48b 100644 (file)
--- a/scripts/backup.in
+++ b/scripts/backup.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 # This program is part of GNU tar
-# Copyright 2004, Free Software Foundation
+# Copyright 2004, 2005, Free Software Foundation
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,12 +14,12 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # Load library routines
 SYSCONFDIR=${SYSCONFDIR-@sysconfdir@}
-. ${LIBPATH-@libexecdir@}/backup.sh
+. ${LIBDIR-@libexecdir@}/backup.sh
 
 DUMP_LEVEL=0
 TIME=
@@ -92,7 +92,7 @@ do
          prev=$option
         ;;
   -V|--v|--ve|--ver|--vers|--versi|--versio|--version)
-        echo "restore; @PACKAGE@ (@VERSION@)"
+        echo "backup (@PACKAGE@ @VERSION@)"
         exit 0;;
   -L|--li|--lic|--lice|--licen|--licens|--license)
         license
@@ -124,7 +124,7 @@ wait_time $TIME
 if [ $DUMP_LEVEL -ne 0 ]; then
     PREV_LEVEL=`expr $DUMP_LEVEL - 1`
     PREV_DATE=`ls -t ${LOGPATH}/log-*-level-$PREV_LEVEL|
-                head -1|
+                head -n 1|
                sed "s,${LOGPATH}/log-\(.*\)-level.*,\1,"`
     if [ "x$PREV_DATE" = x ]; then
         bailout "Can't determine date of the previous backup"
@@ -166,6 +166,7 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
  while [ $# -ne 0 ] ; do
      date="`date`"
      fs="`echo \"${1}\" | sed -e 's/^.*://'`"
+     fs=`root_fs $fs`
      fsname="`echo \"${1}\" | sed -e 's/\//:/g'`"
      remotehost="`expr \"${1}\" : '\([^/][^/]*\):.*'`"
      if [ -z "$remotehost" ]; then
@@ -179,14 +180,8 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
      if [ $DUMP_LEVEL -eq 0 ]; then
         make_level_log ${remotehost}
      else
-        LF=`level_log_name ${fsname} 0`
-        pdate=`remote_run "${remotehost}" ls -l $LF | awk '{
-           printf("%s", $6)
-           for (i=7;i<NF;i++)
-               printf(" %s", $i)
-           print "" }'`
-        echo "Last `prev_level` dump on this filesystem was on $pdate"
-        remote_run "${remotehost}" cp $LF "`level_log_name temp`"
+        echo "Last `prev_level` dump on this filesystem was on $PREV_DATE"
+        remote_run "${remotehost}" cp "`level_log_name ${fsname} $PREV_LEVEL`" "`level_log_name temp`"
      fi
        
      ${DUMP_BEGIN-:} $DUMP_LEVEL $remotehost $fs $fsname
@@ -204,7 +199,7 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
      else
          flush_level_log ${remotehost} ${fsname}
      fi
-     ${MT_STATUS}
+     ${MT_STATUS} "$TAPE_FILE"
      ${DUMP_END-:} $DUMP_LEVEL $remotehost $fs $fsname
      echo "sleeping ${SLEEP_TIME} seconds"
      sleep ${SLEEP_TIME}
@@ -218,7 +213,12 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
 
      date="`date`"
 
-     make_level_log $localhost 
+     if [ $DUMP_LEVEL -eq 0 ]; then
+         make_level_log $localhost 
+     else
+        echo "Last `prev_level` dump on this filesystem was on $PREV_DATE"
+        remote_run "${localhost}" cp "`level_log_name MISC $PREV_LEVEL`" "`level_log_name temp`"
+     fi
 
      echo "Backing up miscellaneous files at ${date}"
     
@@ -235,7 +235,7 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
      else
         flush_level_log $localhost MISC
      fi
-     ${MT_STATUS}
+     ${MT_STATUS} "$TAPE_FILE"
      ${DUMP_END-:} $DUMP_LEVEL $localhost MISC MISC
  else
      echo "No miscellaneous files specified"
@@ -248,7 +248,9 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
  echo "."
 ) 2>&1 | tee -a "${LOGFILE}"
 
-echo "Sending the dump log to ${ADMINISTRATOR}"
-mail -s "Results of backup started ${startdate}" ${ADMINISTRATOR} < "${LOGFILE}"
+if test "${ADMINISTRATOR}" != NONE; then
+     echo "Sending the dump log to ${ADMINISTRATOR}"
+     mail -s "Results of backup started ${startdate}" ${ADMINISTRATOR} < "${LOGFILE}"
+fi
 
 # EOF