X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Fgnupload;h=6621ebd8b7f6e52596b85c7e260fff256e3603e6;hb=be933433b7ad24c4087c187b0107690d6da174ef;hp=04363faa64d75b4fb8de844dfe6badc45bb47fe0;hpb=4294e57788932e47171d553d40b85feb98795685;p=gnulib.git

diff --git a/build-aux/gnupload b/build-aux/gnupload
index 04363faa6..6621ebd8b 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -1,13 +1,13 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2006-05-20.00
+scriptversion=2008-04-02.19
 
-# Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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
-# 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,
@@ -16,20 +16,19 @@ scriptversion=2006-05-20.00
 # 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
 
-GPG='/usr/bin/gpg --batch --no-tty'
+GPG='gpg --batch --no-tty'
 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
@@ -48,7 +47,7 @@ Recognized destinations are:
 
 Example:
   gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           ""--to alpha.gnu.org: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>.
@@ -101,7 +100,7 @@ fi
 
 # 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
@@ -126,16 +125,16 @@ read -r passphrase
 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
 
-for dest in $to;
+for dest in $to
 do
-  for file;
+  for file
   do
     echo "Uploading $file to $dest..."
     files="$file $file.sig"
@@ -143,14 +142,22 @@ do
     case $dest in
       alpha.gnu.org:*)
 	rm -f $file.directive $file.directive.asc
-	echo directory: $destdir >$file.directive
+	cat >$file.directive<<EOF
+version: 1.1
+directory: $destdir
+filename: `basename -- "$file"`
+EOF
 	echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
         ncftpput ftp-upload.gnu.org /incoming/alpha $files $file.directive.asc
 	rm -f $file.directive $file.directive.asc
 	;;
       ftp.gnu.org:*)
 	rm -f $file.directive $file.directive.asc
-	echo directory: $destdir >$file.directive
+	cat >$file.directive<<EOF
+version: 1.1
+directory: $destdir
+filename: `basename -- "$file"`
+EOF
 	echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive
         ncftpput ftp-upload.gnu.org /incoming/ftp $files $file.directive.asc
 	rm -f $file.directive $file.directive.asc