* NEWS: --version now outputs copyright etc., to conform to the

[chaz/tar] / scripts / backup.in

diff --git a/scripts/backup.in b/scripts/backup.in
index d64f2fa00d5d5174803bfcea4a98656edcebc48b..6a50e51d60c9fc21f9190a4d3470cfbb5246e49e 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, 2005, Free Software Foundation
+# Copyright (C) 2004, 2005, 2006 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
@@ -34,11 +34,10 @@ Options are:
    -f, --force             Force backup even if today's log file already
                            exists.
    -v, --verbose[=LEVEL]   Set verbosity level. Default 100.
-   -t, --time=TIME         Wait till TIME, then do backup. 
+   -t, --time=TIME         Wait till TIME, then do backup.
 
-Informational options:   
+Informational options:
    -h, --help              Display this help message.
-   -L, --license           Display program license.
    -V, --version           Display program version.
 
    Optional argument WHEN is for backward compatibility only. It has been
@@ -87,16 +86,14 @@ do
          TIME=$optarg
         ;;
   -t)    prev=--t;;
-  -t*)   TIME=`expr $option : "-t\(.*\)"`;;    
+  -t*)   TIME=`expr $option : "-t\(.*\)"`;;
   --t|--ti|--tim|--time)
          prev=$option
         ;;
   -V|--v|--ve|--ver|--vers|--versi|--versio|--version)
-        echo "backup (@PACKAGE@ @VERSION@)"
-        exit 0;;
-  -L|--li|--lic|--lice|--licen|--licens|--license)
-        license
-        exit;;
+        echo "backup (@PACKAGE_NAME@) @VERSION@"
+        license
+        exit;;
   -h|--h|--he|--hel|--help)
         usage
         exit;;
@@ -108,13 +105,13 @@ do
          else
             TIME=$option
          fi;;
-  esac 
-done    
+  esac
+done
 
 if [ "x$TIME" = x ]; then
     bailout "No backup time specified. Try $PROGNAME --help for more info."
     exit 1
-fi    
+fi
 
 init_backup
 
@@ -138,10 +135,10 @@ fi
 
 if [ "x$FORCE" = "xyes" ]; then
     rm ${LOGFILE}
-fi    
+fi
 
 if [ -f "${LOGFILE}" ] ; then
-   bailout "Log file ${LOGFILE} already exists." 
+   bailout "Log file ${LOGFILE} already exists."
 else
    touch "${LOGFILE}"
 fi
@@ -172,7 +169,7 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
      if [ -z "$remotehost" ]; then
         remotehost=$localhost
      fi
-        
+
      echo "Backing up ${1} at ${date}"
      message 10 "fs=$fs"
      message 10 "fsname=$fsname"
@@ -183,7 +180,7 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
         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
      backup_host ${remotehost} \
                 "--listed=`level_log_name temp`" \
@@ -214,14 +211,14 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
      date="`date`"
 
      if [ $DUMP_LEVEL -eq 0 ]; then
-         make_level_log $localhost 
+         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}"
-    
+
      ${DUMP_BEGIN-:} $DUMP_LEVEL $localhost MISC MISC
      backup_host $localhost \
                "--listed=`level_log_name temp`"\
@@ -243,7 +240,7 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
 
  message 1 "final cleanup"
 
- $MT_REWIND "${TAPE_FILE}" 
+ $MT_REWIND "${TAPE_FILE}"
  $MT_OFFLINE "${TAPE_FILE}"
  echo "."
 ) 2>&1 | tee -a "${LOGFILE}"