From cc43aab4af3c4b1b3428938f73ea1aa241a48f69 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 23 May 2010 15:29:25 +0200 Subject: [PATCH] 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 --- ChangeLog | 9 +++++++++ THANKS | 1 + lib/gnupload | 7 +++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9b188d79..fdf2970e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-05-23 Ralf Wildenhues + + 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 Fix Autoconf version required by Automake's configure. diff --git a/THANKS b/THANKS index 4f8fa84ca..271ae2b08 100644 --- 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 d44507538..5036752ca 100755 --- 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 ." # 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 -- 2.47.2