bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Port recent gnulib-tool change to Dash


From: Paul Eggert
Subject: [PATCH] Port recent gnulib-tool change to Dash
Date: Sun, 29 Oct 2017 15:47:18 -0700

* gnulib-tool (func_create_testdir): Don't assume that the shell
retokenizes after expanding "$@" inside the call to
func_execute_command.  Dash 0.5.8-2.1ubuntu2 does not.
---
 ChangeLog   | 7 +++++++
 gnulib-tool | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 26c56b1..16506ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-29  Paul Eggert  <address@hidden>
+
+       Port recent gnulib-tool change to Dash
+       * gnulib-tool (func_create_testdir): Don't assume that the shell
+       retokenizes after expanding "$@" inside the call to
+       func_execute_command.  Dash 0.5.8-2.1ubuntu2 does not.
+
 2017-10-27  Jim Meyering  <address@hidden>
 
        timespec.h: use "assure" to avoid a spurious warning
diff --git a/gnulib-tool b/gnulib-tool
index 36493a9..03641ae 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -6478,7 +6478,9 @@ func_create_testdir ()
    fi
    func_execute_command ${AUTOCONF} || func_exit 1
    # Explicit 'touch config.h.in': see 
<https://savannah.gnu.org/support/index.php?109406>.
-   func_execute_command "${AUTOHEADER} && touch config.h.in" || func_exit 1
+   func_execute_command ${AUTOHEADER} &&
+       func_execute_command touch config.h.in ||
+           func_exit 1
    func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1
    rm -rf autom4te.cache
   ) || func_exit 1
@@ -6501,7 +6503,9 @@ func_create_testdir ()
      fi
      func_execute_command ${AUTOCONF} || func_exit 1
      # Explicit 'touch config.h.in': see 
<https://savannah.gnu.org/support/index.php?109406>.
-     func_execute_command "${AUTOHEADER} && touch config.h.in" || func_exit 1
+     func_execute_command ${AUTOHEADER} &&
+         func_execute_command touch config.h.in ||
+             func_exit 1
      func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1
      rm -rf autom4te.cache
     ) || func_exit 1
-- 
2.7.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]