* lib/gnupload: Add support for savannah.gnu.org and

savannah.nongnu.org.

diff --git a/ChangeLog b/ChangeLog
index 8ee5c155163318febd2a65604aca80aedab48c2c..3681c97c810a7aacd92607b70f9d49151153b7d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-13  Werner Lemberg  <wl@gnu.org>
+
+       * lib/gnupload: Add support for savannah.gnu.org and
+       savannah.nongnu.org.
+
 2006-05-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * lib/Automake/Channels.pm, lib/Automake/Condition.pm,

diff --git a/lib/gnupload b/lib/gnupload
index d169d0012b4bdc886713418bfd558467c3650ae7..9949157d1321890baf43ee17d601efa781bdc0d8 100755 (executable)
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2005-05-14.22
+scriptversion=2006-05-11.09
 
-# Copyright (C) 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
@@ -39,8 +39,11 @@ Options:
   --version                output version information and exit
 
 Recognized destinations are:
-  alpha.gnu.org:DIRECTORY  build directive files and upload files by FTP
-  ftp.gnu.org:DIRECTORY    build directive files and upload files by FTP
+  alpha.gnu.org:DIRECTORY
+  savannah.gnu.org:DIRECTORY
+  savannah.nongnu.org:DIRECTORY
+  ftp.gnu.org:DIRECTORY
+                           build directive files and upload files by FTP
   [user@]host:DIRECTORY    upload files with scp
 
 Example:
@@ -136,21 +139,28 @@ do
   do
     echo "Uploading $file to $dest..."
     files="$file $file.sig"
+    destdir=`echo $dest | sed 's/[^:]*://'`
     case $dest in
       alpha.gnu.org:*)
        rm -f $file.directive $file.directive.asc
-       echo directory: `echo $dest | sed 's/[^:]*://'` >$file.directive
+       echo directory: $destdir >$file.directive
        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: `echo $dest | sed 's/[^:]*://'` >$file.directive
+       echo directory: $destdir >$file.directive
        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
        ;;
+      savannah.gnu.org:*)
+        ncftpput savannah.gnu.org /incoming/savannah/$destdir $files
+       ;;
+      savannah.nongnu.org:*)
+        ncftpput savannah.nongnu.org /incoming/savannah/$destdir $files
+       ;;
       *)
        scp $files $dest
        ;;