projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from texinfo
[gnulib.git]
/
build-aux
/
gnupload
diff --git
a/build-aux/gnupload
b/build-aux/gnupload
index
511070a
..
b71ddfd
100755
(executable)
--- a/
build-aux/gnupload
+++ b/
build-aux/gnupload
@@
-1,10
+1,9
@@
#!/bin/sh
# Sign files and upload them.
#!/bin/sh
# Sign files and upload them.
-scriptversion=201
0-02-06.18
; # UTC
+scriptversion=201
2-01-15.15
; # UTC
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation
+# Copyright (C) 2004-2012 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
#
# 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
@@
-20,6
+19,8
@@
scriptversion=2010-02-06.18; # UTC
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Originally written by Alexandre Duret-Lutz <adl@gnu.org>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Originally written by Alexandre Duret-Lutz <adl@gnu.org>.
+# The master copy of this file is maintained in the gnulib Git repository.
+# Please send bug reports and feature requests to bug-gnulib@gnu.org.
set -e
set -e
@@
-32,6
+33,8
@@
delete_files=
delete_symlinks=
collect_var=
dbg=
delete_symlinks=
collect_var=
dbg=
+nl='
+'
usage="Usage: $0 [OPTION]... [CMD] FILE... [[CMD] FILE...]
usage="Usage: $0 [OPTION]... [CMD] FILE... [[CMD] FILE...]
@@
-55,7
+58,7
@@
Options:
--version output version information and exit
If --symlink-regex is given without EXPR, then the link target name
--version output version information and exit
If --symlink-regex is given without EXPR, then the link target name
-is created by replacing the version information with
\`
-latest', e.g.:
+is created by replacing the version information with
'
-latest', e.g.:
foo-1.3.4.tar.gz -> foo-latest.tar.gz
foo-1.3.4.tar.gz -> foo-latest.tar.gz
@@
-103,13
+106,13
@@
happen to have an ncftp package installed, the ncftpput-ftp script in
the build-aux/ directory of the gnulib package
(http://savannah.gnu.org/projects/gnulib) may serve as a replacement.
the build-aux/ directory of the gnulib package
(http://savannah.gnu.org/projects/gnulib) may serve as a replacement.
-Report bugs to <bug-automake@gnu.org>.
-Send patches to <automake-patches@gnu.org>."
+Send patches and bug reports to <bug-gnulib@gnu.org>."
# Read local configuration file
if test -r "$conffile"; then
echo "$0: Reading configuration file $conffile"
# Read local configuration file
if test -r "$conffile"; then
echo "$0: Reading configuration file $conffile"
- eval set x "`sed 's/#.*$//;/^$/d' \"$conffile\" | tr '\012\015' ' '` \"\$@\""
+ conf=`sed 's/#.*$//;/^$/d' "$conffile" | tr "\015$nl" ' '`
+ eval set x "$conf \"\$@\""
shift
fi
shift
fi
@@
-167,7
+170,7
@@
while test -n "$1"; do
break
;;
-*)
break
;;
-*)
- echo "$0: Unknown option
\`$1', try \`
$0 --help'" 1>&2
+ echo "$0: Unknown option
'$1', try '
$0 --help'" 1>&2
exit 1
;;
esac
exit 1
;;
esac
@@
-185,7
+188,7
@@
done
dprint()
{
dprint()
{
- echo "Running $*..."
+ echo "Running $*
..."
}
if $dry_run; then
}
if $dry_run; then
@@
-216,7
+219,7
@@
else
for file
do
if test ! -f $file; then
for file
do
if test ! -f $file; then
- echo "$0: Cannot find
\`
$file'" 1>&2
+ echo "$0: Cannot find
'
$file'" 1>&2
exit 1
elif test -n "$symlink_expr"; then
linkname=`echo $file | sed "$symlink_expr"`
exit 1
elif test -n "$symlink_expr"; then
linkname=`echo $file | sed "$symlink_expr"`
@@
-235,10
+238,10
@@
fi
unset passphrase
# Reset PATH to be sure that echo is a built-in. We will later use
unset passphrase
# Reset PATH to be sure that echo is a built-in. We will later use
-#
`
echo $passphrase' to output the passphrase, so it is important that
-# it is a built-in (third-party programs tend to appear in
`
ps'
+#
'
echo $passphrase' to output the passphrase, so it is important that
+# it is a built-in (third-party programs tend to appear in
'
ps'
# listings with their arguments...).
# listings with their arguments...).
-# Remember this script runs with
`
set -e', so if echo is not built-in
+# Remember this script runs with
'
set -e', so if echo is not built-in
# it will exit now.
PATH=/empty echo -n "Enter GPG passphrase: "
stty -echo
# it will exit now.
PATH=/empty echo -n "Enter GPG passphrase: "
stty -echo
@@
-249,7
+252,7
@@
echo
if test $# -ne 0; then
for file
do
if test $# -ne 0; then
for file
do
- echo "Signing $file..."
+ echo "Signing $file
..."
rm -f $file.sig
echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file
done
rm -f $file.sig
echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file
done
@@
-388,7
+391,7
@@
for dest in $to
do
for file
do
do
for file
do
- echo "Uploading $file to $dest..."
+ echo "Uploading $file to $dest
..."
stmt=
files="$file $file.sig"
destdir=`echo $dest | sed 's/[^:]*://'`
stmt=
files="$file $file.sig"
destdir=`echo $dest | sed 's/[^:]*://'`