mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
GNU coding standards.  Remove --license.
* gnulib.modules: Add version-etc-fsf.
* doc/tar.texi: Document the change.
* lib/.cvsignore: Add version-etc-fsf.c, version-etc.c, version-etc.h.
* scripts/Makefile.am (SED_CMD): Update PAKCAGE_NAME, not PACKAGE.
* scripts/backup.in: Remove --license.  Change --version to conform
to GCS.
* scripts/restore.in: Likewise.
* scripts/backup.sh.in (license): Output briefer license in the
style of coreutils, for consistency with other changes.
* src/tar.c: Include <version-etc.h>.
(LICENSE_OPTION): Remove.
(options): Remove --license.
(license): Remove.
(parse_opt): Use version_etc instead of rolling it ourselves.
Remove --license.
* tests/version.at (tar --version): Check only the first line of
output.
This commit is contained in:
Paul Eggert
2006-02-07 22:18:36 +00:00
parent e86e864544
commit 78b078b455
11 changed files with 171 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/Makefile.am
View File

@@ -1,4 +1,4 @@
# Copyright (C) 2004 Free Software Foundation, Inc.
# Copyright (C) 2004, 2006 Free Software Foundation, Inc.
## 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
@@ -31,7 +31,7 @@ CLEANFILES=backup.sh backup restore dump-remind
SED_CMD="s,\@libexecdir\@,$(libexecdir),;\
s,\@sysconfdir\@,$(sysconfdir),;\
s,\@PACKAGE\@,$(PACKAGE),;\
s,\@PACKAGE_NAME\@,$(PACKAGE_NAME),;\
s,\@VERSION\@,$(VERSION),;\
s,\@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),;\
s,\@DATE_FORMAT_OK\@,$(DATE_FORMAT_OK),;@BACKUP_SED_COND@"

37
scripts/backup.in
View File

@@ -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}"

37
scripts/backup.sh.in
View File

@@ -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, Inc.
#
# 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
@@ -78,7 +78,7 @@ bailout() {
# Return current date
now() {
#IF_DATE_FORMAT_OK
#IF_DATE_FORMAT_OK
date +%Y-%m-%d
#ELSE_DATE_FORMAT_OK
LC_ALL=C date | \
@@ -108,7 +108,7 @@ test_root() {
root_fs() {
echo "${ROOT_FS}$1" | tr -s /
}
}
advice() {
echo "Directory $1 is not found." >&2
@@ -139,7 +139,7 @@ init_common() {
advice $LOGPATH
exit 1
fi
fi
fi
# Get the values of BACKUP_DIRS, BACKUP_FILES, and other variables.
if [ ! -r $CONFIGFILE ]; then
echo "$PROGNAME: cannot read $CONFIGFILE. Stop." >&2
@@ -151,7 +151,7 @@ init_common() {
test_root
if [ x"${ADMINISTRATOR}" = x ]; then
if [ x"${ADMINISTRATOR}" = x ]; then
bailout "ADMINISTRATOR not defined"
fi
@@ -159,7 +159,7 @@ init_common() {
[ x"$SLEEP_TIME" = x ] && SLEEP_TIME=60
if [ x$VOLNO_FILE = x ]; then
bailout "VOLNO_FILE not specified"
bailout "VOLNO_FILE not specified"
fi
if [ -r $DIRLIST ]; then
@@ -253,7 +253,7 @@ wait_time() {
diff = 3600 * (time[1] - now[1]) + 60 * (time[2] - now[2]);
if (diff < 0)
diff += 3600 * 24
print diff
print diff
}'`"
clear
echo "${SLEEP_MESSAGE}"
@@ -320,7 +320,7 @@ print_level() {
else
echo "Level ${1-$DUMP_LEVEL}"
fi
}
}
prev_level() {
print_level `expr $DUMP_LEVEL - 1` | tr A-Z a-z
@@ -339,22 +339,9 @@ remote_run() {
license() {
cat - <<EOF
This program is part of GNU tar
Copyright 2004, 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
the Free Software Foundation; either version 1, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
Copyright (C) 2006 Free Software Foundation, Inc.
This is free software. You may redistribute copies of it under the terms of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.
EOF
}

40
scripts/restore.in
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# This program is part of GNU tar
# Copyright 2004, Free Software Foundation
# Copyright (C) 2004, 2006 Free Software Foundation, Inc.
#
# 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
@@ -31,9 +31,8 @@ Options are:
(default $DUMP_LEVEL).
-v, --verbose[=LEVEL] Set verbosity level. Default 100.
Informational options:
Informational options:
-h, --help Display this help message.
-L, --license Display program license.
-V, --version Display program version.
Send bug reports to @PACKAGE_BUGREPORT@.
@@ -72,30 +71,28 @@ do
;;
-v*) VERBOSE=`expr $option : "-v\(.*\)"`;;
-V|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "restore (@PACKAGE@ @VERSION@)"
exit 0;;
-L|--li|--lic|--lice|--licen|--licens|--license)
license
exit;;
echo "restore (@PACKAGE_NAME@) @VERSION@"
license
exit;;
-h|--h|--he|--hel|--help)
usage
exit;;
-*) bailout "Unknown option $opt. Try $PROGNAME --help for more info.";;
*) if [ -z "$PATTERN" ]; then
PATTERN=$opt
else
else
PATTERN="$PATTERN|$opt"
fi
;;
esac
done
esac
done
if [ -z "$RESTORE_ALL" ]; then
if [ -z "$PATTERN" ]; then
usage
exit;
fi
fi
fi
init_restore
cat > $LOGFILE <<EOF
@@ -105,7 +102,7 @@ It was created by GNU $PROGNAME, from @PACKAGE@ (@VERSION@).
Invocation command line was
\$ $CMDLINE
EOF
restore_fs()
@@ -141,14 +138,14 @@ restore_fs()
DATE=`get_dump_time $level`
FILE="`level_log_name ${fsname} ${level}`"
message 10 "FILE=$FILE"
LABEL="`print_level $level` backup of ${fs} on ${remotehost} at ${DATE}"
${RESTORE_BEGIN-:} $level $remotehost $fs $fsname
backup_host ${remotehost} \
"--listed=\"$FILE\"" \
"--label=\"$LABEL\"" \
-C $fs
${RESTORE_END-:} $level $remotehost $fs $fsname
${RESTORE_END-:} $level $remotehost $fs $fsname
done
}
@@ -169,11 +166,11 @@ restore_files()
continue;
fi
message 10 "Restoring level $level"
DATE=`get_dump_time $level`
FILE="`level_log_name MISC ${level}`"
message 10 "FILE=$FILE"
LABEL="`print_level $level` backup of miscellaneous files at ${DATE}"
${RESTORE_BEGIN-:} $level $localhost MISC MISC
backup_host ${localhost} \
@@ -226,12 +223,7 @@ if [ "x${BACKUP_FILES}" != "x" ] ; then
done
[ -z "$RESTORE_FILES" ] || restore_files $RESTORE_FILES
fi
fi) 2>&1 | tee -a "${LOGFILE}"
# EOF
# EOF