* lib/sys_time_.h: Use a recursion-safe inclusion guard rather than

[gnulib.git] / build-aux / gnupload

diff --git a/build-aux/gnupload b/build-aux/gnupload
index 9949157..34dfa70 100755 (executable)
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2006-05-11.09
+scriptversion=2007-06-30.12
 
-# Copyright (C) 2004, 2005, 2006  Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2007  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
@@ -29,7 +29,8 @@ 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
@@ -101,7 +102,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 +127,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 +144,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: $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: $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