From: Bruno Haible Date: Sat, 15 Jun 2019 20:03:09 +0000 (+0200) Subject: Fix comments in last commit. X-Git-Tag: v1.0~4874 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c2fdc30cf07848654d70063af200d94a616a1093;p=gnulib.git Fix comments in last commit. Reported by Paul Eggert. * build-aux/useless-if-before-free: Fix comment regarding the second line. * build-aux/announce-gen: Likewise. * build-aux/gitlog-to-changelog: Likewise. * build-aux/prefix-gnulib-mk: Likewise. * build-aux/update-copyright: Likewise. * tests/test-update-copyright.sh: Update test program accordingly. --- diff --git a/build-aux/announce-gen b/build-aux/announce-gen index b5728338c7..bbcaa1ab32 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -6,12 +6,12 @@ # or execvp() fails with ENOEXEC if it is a script that does not start # with a #! line. The script interpreter mentioned in the #! line has # to be /bin/sh, because on GuixSD systems that is the only program that -# has a fixed file name. The second line is for editing this file in -# Emacs. The next two lines below are valid code in both sh and perl. -# When executed by sh, they re-execute the script through the perl -# program found in $PATH. The '-x' option is essential; without it, -# perl would re-execute the script through /bin/sh. When executed by -# perl, the next two lines are a no-op. +# has a fixed file name. The second line is essential for perl and is +# also useful for editing this file in Emacs. The next two lines below +# are valid code in both sh and perl. When executed by sh, they re-execute +# the script through the perl program found in $PATH. The '-x' option +# is essential as well; without it, perl would re-execute the script +# through /bin/sh. When executed by perl, the next two lines are a no-op. eval 'exec perl -wSx "$0" "$@"' if 0; diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index a616b82343..b2780efbeb 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -6,12 +6,12 @@ # or execvp() fails with ENOEXEC if it is a script that does not start # with a #! line. The script interpreter mentioned in the #! line has # to be /bin/sh, because on GuixSD systems that is the only program that -# has a fixed file name. The second line is for editing this file in -# Emacs. The next two lines below are valid code in both sh and perl. -# When executed by sh, they re-execute the script through the perl -# program found in $PATH. The '-x' option is essential; without it, -# perl would re-execute the script through /bin/sh. When executed by -# perl, the next two lines are a no-op. +# has a fixed file name. The second line is essential for perl and is +# also useful for editing this file in Emacs. The next two lines below +# are valid code in both sh and perl. When executed by sh, they re-execute +# the script through the perl program found in $PATH. The '-x' option +# is essential as well; without it, perl would re-execute the script +# through /bin/sh. When executed by perl, the next two lines are a no-op. eval 'exec perl -wSx "$0" "$@"' if 0; diff --git a/build-aux/prefix-gnulib-mk b/build-aux/prefix-gnulib-mk index 66e138b46f..864f3bf029 100755 --- a/build-aux/prefix-gnulib-mk +++ b/build-aux/prefix-gnulib-mk @@ -6,12 +6,12 @@ # or execvp() fails with ENOEXEC if it is a script that does not start # with a #! line. The script interpreter mentioned in the #! line has # to be /bin/sh, because on GuixSD systems that is the only program that -# has a fixed file name. The second line is for editing this file in -# Emacs. The next two lines below are valid code in both sh and perl. -# When executed by sh, they re-execute the script through the perl -# program found in $PATH. The '-x' option is essential; without it, -# perl would re-execute the script through /bin/sh. When executed by -# perl, the next two lines are a no-op. +# has a fixed file name. The second line is essential for perl and is +# also useful for editing this file in Emacs. The next two lines below +# are valid code in both sh and perl. When executed by sh, they re-execute +# the script through the perl program found in $PATH. The '-x' option +# is essential as well; without it, perl would re-execute the script +# through /bin/sh. When executed by perl, the next two lines are a no-op. eval 'exec perl -wSx "$0" "$@"' if 0; diff --git a/build-aux/update-copyright b/build-aux/update-copyright index fa9d427e92..063500d417 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -6,12 +6,12 @@ # or execvp() fails with ENOEXEC if it is a script that does not start # with a #! line. The script interpreter mentioned in the #! line has # to be /bin/sh, because on GuixSD systems that is the only program that -# has a fixed file name. The second line is for editing this file in -# Emacs. The next two lines below are valid code in both sh and perl. -# When executed by sh, they re-execute the script through the perl -# program found in $PATH. The '-x' option is essential; without it, -# perl would re-execute the script through /bin/sh. When executed by -# perl, the next two lines are a no-op. +# has a fixed file name. The second line is essential for perl and is +# also useful for editing this file in Emacs. The next two lines below +# are valid code in both sh and perl. When executed by sh, they re-execute +# the script through the perl program found in $PATH. The '-x' option +# is essential as well; without it, perl would re-execute the script +# through /bin/sh. When executed by perl, the next two lines are a no-op. eval 'exec perl -wSx "$0" "$@"' if 0; diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index 0701e7b20b..88a787c761 100755 --- a/build-aux/useless-if-before-free +++ b/build-aux/useless-if-before-free @@ -6,12 +6,12 @@ # or execvp() fails with ENOEXEC if it is a script that does not start # with a #! line. The script interpreter mentioned in the #! line has # to be /bin/sh, because on GuixSD systems that is the only program that -# has a fixed file name. The second line is for editing this file in -# Emacs. The next two lines below are valid code in both sh and perl. -# When executed by sh, they re-execute the script through the perl -# program found in $PATH. The '-x' option is essential; without it, -# perl would re-execute the script through /bin/sh. When executed by -# perl, the next two lines are a no-op. +# has a fixed file name. The second line is essential for perl and is +# also useful for editing this file in Emacs. The next two lines below +# are valid code in both sh and perl. When executed by sh, they re-execute +# the script through the perl program found in $PATH. The '-x' option +# is essential as well; without it, perl would re-execute the script +# through /bin/sh. When executed by perl, the next two lines are a no-op. eval 'exec perl -wSx "$0" "$@"' if 0; diff --git a/tests/test-update-copyright.sh b/tests/test-update-copyright.sh index 9ef5344ead..5950e508b3 100755 --- a/tests/test-update-copyright.sh +++ b/tests/test-update-copyright.sh @@ -45,12 +45,12 @@ cat <<\EOF > $s # or execvp() fails with ENOEXEC if it is a script that does not start # with a #! line. The script interpreter mentioned in the #! line has # to be /bin/sh, because on GuixSD systems that is the only program that -# has a fixed file name. The second line is for editing this file in -# Emacs. The next two lines below are valid code in both sh and perl. -# When executed by sh, they re-execute the script through the perl -# program found in $PATH. The '-x' option is essential; without it, -# perl would re-execute the script through /bin/sh. When executed by -# perl, the next two lines are a no-op. +# has a fixed file name. The second line is essential for perl and is +# also useful for editing this file in Emacs. The next two lines below +# are valid code in both sh and perl. When executed by sh, they re-execute +# the script through the perl program found in $PATH. The '-x' option +# is essential as well; without it, perl would re-execute the script +# through /bin/sh. When executed by perl, the next two lines are a no-op. eval 'exec perl -wSx "$0" "$@"' if 0;