From: Sergey Poznyakoff Date: Sat, 8 May 2004 22:22:24 +0000 (+0000) Subject: Minor fix X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=d58eaa815d7afe37a30cd111c3de687b0913fb6a;p=chaz%2Ftar Minor fix --- diff --git a/configure.ac b/configure.ac index a495abf..92f3670 100644 --- a/configure.ac +++ b/configure.ac @@ -245,9 +245,9 @@ AC_CHECK_TYPE(iconv_t,:, AC_SUBST(BACKUP_SED_COND) if date +%Y-%m-%d 2>/dev/null >&2; then - BACKUP_SED_COND='/^#ELSE_DATE_FORMAT_OK/,/^#ENDIF_DATE_FORMAT_OK/d;/^#IF_DATE_FORMAT_OK/d' + BACKUP_SED_COND='/^\#ELSE_DATE_FORMAT_OK/,/^\#ENDIF_DATE_FORMAT_OK/d;/^\#IF_DATE_FORMAT_OK/d' else - BACKUP_SED_COND='/^#IF_DATE_FORMAT_OK/,/^#ELSE_DATE_FORMAT_OK/d;/^#ENDIF_DATE_FORMAT_OK/d' + BACKUP_SED_COND='/^\#IF_DATE_FORMAT_OK/,/^\#ELSE_DATE_FORMAT_OK/d;/^\#ENDIF_DATE_FORMAT_OK/d' fi diff --git a/scripts/backup.in b/scripts/backup.in index aa9bca7..7baa4a0 100644 --- a/scripts/backup.in +++ b/scripts/backup.in @@ -21,48 +21,27 @@ SYSCONFDIR=${SYSCONFDIR-@sysconfdir@} . ${LIBPATH-@libexecdir@}/backup.sh -now() { -#IF_DATE_FORMAT_OK - date +%Y-%m-%d -#ELSE_DATE_FORMAT_OK - LC_ALL=C date | \ - sed 's/[^ ]* *\([^ ]*\) *\([^ ]*\).* \([^ ]*\)$/\3-\1-\2/ - /-[0-9]$/s/\([0-9]\)$/0\1/ - /Jan/{s/Jan/01/p;q;} - /Feb/{s/Feb/02/p;q;} - /Mar/{s/Mar/03/p;q;} - /Apr/{s/Apr/04/p;q;} - /May/{s/May/05/p;q;} - /Jun/{s/Jun/06/p;q;} - /Jul/{s/Jul/07/p;q;} - /Aug/{s/Aug/08/p;q;} - /Sep/{s/Sep/09/p;q;} - /Oct/{s/Oct/10/p;q;} - /Nov/{s/Nov/11/p;q;} - /Dec/{s/Dec/12/p;q;}' -#ENDIF_DATE_FORMAT_OK -} - DUMP_LEVEL=0 TIME= +NOW=`now` usage() { cat - <&2 - # I'm assuming that the tar will have written an empty - # file to the tape, otherwise I should do a cat here. - else - flush_level_log ${remotehost} ${fsname} - fi - ${MT_STATUS} - echo "sleeping ${SLEEP_TIME} seconds" - sleep ${SLEEP_TIME} - shift + # `rsh' doesn't exit with the exit status of the remote command. What + # stupid lossage. TODO: think of a reliable workaround. + if [ $? -ne 0 ] ; then + echo "Backup of ${1} failed." 1>&2 + # I'm assuming that the tar will have written an empty + # file to the tape, otherwise I should do a cat here. + else + flush_level_log ${remotehost} ${fsname} + fi + ${MT_STATUS} + ${DUMP_END-:} $DUMP_LEVEL $remotehost $fs $fsname + echo "sleeping ${SLEEP_TIME} seconds" + sleep ${SLEEP_TIME} + shift done # Dump any individual files requested. if [ "x${BACKUP_FILES}" != "x" ] ; then - message 1 "processing individual files" + message 1 "processing individual files" - date="`date`" + date="`date`" - make_level_log $localhost + make_level_log $localhost - echo "Backing up miscellaneous files at ${date}" + echo "Backing up miscellaneous files at ${date}" - backup_host $localhost \ + ${DUMP_BEGIN-:} $DUMP_LEVEL $localhost MISC MISC + backup_host $localhost \ "--listed=`level_log_name temp`"\ - "--label='`print_level` backup of miscellaneous files at ${date}'" \ + "--label='`print_level` backup of miscellaneous files at ${NOW}'" \ ${BACKUP_FILES} - if [ $? -ne 0 ] ; then - echo "Backup of miscellaneous files failed." - # I'm assuming that the tar will have written an empty - # file to the tape, otherwise I should do a cat here. - else - flush_level_log $localhost - fi - ${MT_STATUS} + if [ $? -ne 0 ] ; then + echo "Backup of miscellaneous files failed." + # I'm assuming that the tar will have written an empty + # file to the tape, otherwise I should do a cat here. + else + flush_level_log $localhost MISC + fi + ${MT_STATUS} + ${DUMP_END-:} $DUMP_LEVEL $localhost MISC MISC else - echo "No miscellaneous files specified" + echo "No miscellaneous files specified" fi message 1 "final cleanup" $MT_REWIND "${TAPE_FILE}" $MT_OFFLINE "${TAPE_FILE}" - + echo "." ) 2>&1 | tee -a "${LOGFILE}" echo "Sending the dump log to ${ADMINISTRATOR}" mail -s "Results of backup started ${startdate}" ${ADMINISTRATOR} < "${LOGFILE}" -# eof +# EOF