Make gnupload portable to EBCDIC hosts.

* lib/gnupload: Use literal newline as argument for 'tr' rather
than \015, for EBCDIC hosts.  Also, avoid unportable nested
double-quotes and backquotes.
* THANKS: Update.
Report from Eric Blake and Steve Goetze via gnulib.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index c9b188d79889dc17c699d803ca63d6e8205c12fc..fdf2970e5c904001bd89edbf03343e3fccd5a2a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Make gnupload portable to EBCDIC hosts.
+       * lib/gnupload: Use literal newline as argument for 'tr' rather
+       than \015, for EBCDIC hosts.  Also, avoid unportable nested
+       double-quotes and backquotes.
+       * THANKS: Update.
+       Report from Eric Blake and Steve Goetze via gnulib.
+
 2010-05-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Fix Autoconf version required by Automake's configure.

diff --git a/THANKS b/THANKS
index 4f8fa84caa4592c98e54f63cce8beaee24b1b0d7..271ae2b08effef3ec193ddd462d788dda05c5532 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -321,6 +321,7 @@ Stefan Nordhausen   nordhaus@informatik.hu-berlin.de
 Stefano Lattarini      stefano.lattarini@gmail.com
 Stepan Kasal           kasal@math.cas.cz
 Steve M. Robbins       steve@nyongwa.montreal.qc.ca
+Steve Goetze           goetze@dovetail.com
 Steven G. Johnson      stevenj@alum.mit.edu
 Sven Verdoolaege       skimo@kotnet.org
 Tamara L. Dahlgren     dahlgren1@llnl.gov

diff --git a/lib/gnupload b/lib/gnupload
index d4450753821d7864f19e9d525ed96fd71793e0de..5036752ca3381cfbbded42fc3a29fc32ac26bf5e 100755 (executable)
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2010-02-08.07; # UTC
+scriptversion=2010-05-23.15; # UTC
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
@@ -32,6 +32,8 @@ delete_files=
 delete_symlinks=
 collect_var=
 dbg=
+nl='
+'
 
 usage="Usage: $0 [OPTION]... [CMD] FILE... [[CMD] FILE...]
 
@@ -109,7 +111,8 @@ Send patches to <automake-patches@gnu.org>."
 # 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