projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid assigning ARPA_INET_H in different .m4 files.
[gnulib.git]
/
build-aux
/
gnupload
diff --git
a/build-aux/gnupload
b/build-aux/gnupload
index
2f9a1fd
..
b90e3ae
100755
(executable)
--- a/
build-aux/gnupload
+++ b/
build-aux/gnupload
@@
-1,13
+1,13
@@
#!/bin/sh
# Sign files and upload them.
#!/bin/sh
# Sign files and upload them.
-scriptversion=200
6-11-08.20
+scriptversion=200
8-04-02.19
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006
, 2007, 2008
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
#
# 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
2
, or (at your option)
+# the Free Software Foundation; either version
3
, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# any later version.
#
# This program is distributed in the hope that it will be useful,
@@
-16,20
+16,19
@@
scriptversion=2006-11-08.20
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# 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.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Originally written by Alexandre Duret-Lutz <adl@gnu.org>.
set -e
# Originally written by Alexandre Duret-Lutz <adl@gnu.org>.
set -e
-GPG='
/usr/bin/
gpg --batch --no-tty'
+GPG='gpg --batch --no-tty'
to=
usage="Usage: $0 [OPTIONS]... FILES...
to=
usage="Usage: $0 [OPTIONS]... FILES...
-Sign all FILES, and upload them to selected destinations.
+Sign all FILES, and upload them to selected destinations, according to
+<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>.
Options:
--help print this help text and exit
Options:
--help print this help text and exit
@@
-46,9
+45,13
@@
Recognized destinations are:
build directive files and upload files by FTP
[user@]host:DIRECTORY upload files with scp
build directive files and upload files by FTP
[user@]host:DIRECTORY upload files with scp
-Example:
+Simple single-target single-file examples:
+ gnupload --to alpha.gnu.org:automake automake-1.8.2b.tar.gz
+ gnupload --to ftp.gnu.org:automake automake-1.8.3.tar.gz
+
+Multiple-target multiple-file example:
gnupload --to sources.redhat.com:~ftp/pub/automake \\
gnupload --to sources.redhat.com:~ftp/pub/automake \\
- --to alpha.gnu.org:
gnu/
automake \\
+ --to alpha.gnu.org:automake \\
automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
Report bugs to <bug-automake@gnu.org>.
automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
Report bugs to <bug-automake@gnu.org>.
@@
-101,7
+104,7
@@
fi
# Make sure all files exist. We don't want to ask
# for the passphrase if the script will fail.
# Make sure all files exist. We don't want to ask
# for the passphrase if the script will fail.
-for file
;
+for file
do
if test ! -f $file; then
echo "$0: Cannot find \`$file'" 1>&2
do
if test ! -f $file; then
echo "$0: Cannot find \`$file'" 1>&2
@@
-126,16
+129,16
@@
read -r passphrase
stty echo
echo
stty echo
echo
-for file
;
+for file
do
echo "Signing $file..."
rm -f $file.sig
echo $passphrase | $GPG --passphrase-fd 0 -ba -o $file.sig $file
done
do
echo "Signing $file..."
rm -f $file.sig
echo $passphrase | $GPG --passphrase-fd 0 -ba -o $file.sig $file
done
-for dest in $to
;
+for dest in $to
do
do
- for file
;
+ for file
do
echo "Uploading $file to $dest..."
files="$file $file.sig"
do
echo "Uploading $file to $dest..."
files="$file $file.sig"
@@
-146,7
+149,7
@@
do
cat >$file.directive<<EOF
version: 1.1
directory: $destdir
cat >$file.directive<<EOF
version: 1.1
directory: $destdir
-filename:
$file
+filename:
`basename -- "$file"`
EOF
echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
ncftpput ftp-upload.gnu.org /incoming/alpha $files $file.directive.asc
EOF
echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
ncftpput ftp-upload.gnu.org /incoming/alpha $files $file.directive.asc
@@
-157,7
+160,7
@@
EOF
cat >$file.directive<<EOF
version: 1.1
directory: $destdir
cat >$file.directive<<EOF
version: 1.1
directory: $destdir
-filename:
$file
+filename:
`basename -- "$file"`
EOF
echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
ncftpput ftp-upload.gnu.org /incoming/ftp $files $file.directive.asc
EOF
echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
ncftpput ftp-upload.gnu.org /incoming/ftp $files $file.directive.asc