perl scripts: remove #!/usr/bin/perl in favor of more portable...

Rather than putting #!/usr/bin/perl on the first line,
start with a variant of what's recommended by "man perlrun" that
invokes the first "perl" program from your shell's search path.
* build-aux/gitlog-to-changelog: Replace #!... as above.
Add a "Local Variables" perl mode setting.
Prompted by a patch from Ludovic Courtès.
Improved by Eric Blake.
* build-aux/useless-if-before-free: Likewise.
* build-aux/announce-gen: Likewise.
* build-aux/update-copyright: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 4e5e0bb3a52de51921aaa90838b03bcb2eb6d58c..561e6d4ac6bc1b14709e948f27c86f58f8d291d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-30  Jim Meyering  <meyering@redhat.com>
+
+       perl scripts: remove #!/usr/bin/perl in favor of more portable...
+       Rather than putting #!/usr/bin/perl on the first line,
+       start with a variant of what's recommended by "man perlrun" that
+       invokes the first "perl" program from your shell's search path.
+       * build-aux/gitlog-to-changelog: Replace #!... as above.
+       Add a "Local Variables" perl mode setting.
+       Prompted by a patch from Ludovic Courtès.
+       Improved by Eric Blake.
+       * build-aux/useless-if-before-free: Likewise.
+       * build-aux/announce-gen: Likewise.
+       * build-aux/update-copyright: Likewise.
+
 2009-10-29  Eric Blake  <ebb9@byu.net>
 
        filenamecat-lgpl: adjust clients

diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 972b88146321b0997b4ab1fcfc99df07f2e1f514..e6be9f81e89858186ad56f54cb63e72d08c56e7a 100755 (executable)
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -1,7 +1,9 @@
-#!/usr/bin/perl -w
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+  & eval 'exec perl -wS "$0" $argv:q'
+    if 0;
 # Generate a release announcement message.
 
-my $VERSION = '2009-09-11 09:50'; # UTC
+my $VERSION = '2009-10-30 15:59'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -476,19 +478,15 @@ EOF
 
 ### Setup "GNU" style for perl-mode and cperl-mode.
 ## Local Variables:
+## mode: perl
 ## perl-indent-level: 2
 ## perl-continued-statement-offset: 2
 ## perl-continued-brace-offset: 0
 ## perl-brace-offset: 0
 ## perl-brace-imaginary-offset: 0
 ## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
+## perl-extra-newline-before-brace: t
+## perl-merge-trailing-else: nil
 ## eval: (add-hook 'write-file-hooks 'time-stamp)
 ## time-stamp-start: "my $VERSION = '"
 ## time-stamp-format: "%:y-%02m-%02d %02H:%02M"

diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index a0f8a088e2cfa9a832aa5de840e358557405f59b..32f76e8e2360e30b3463b50081a85f7e6b8026da 100755 (executable)
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -1,7 +1,9 @@
-#!/usr/bin/perl
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+  & eval 'exec perl -wS "$0" $argv:q'
+    if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2009-08-12 16:49'; # UTC
+my $VERSION = '2009-10-30 13:46'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -179,6 +181,7 @@ sub quoted_cmd(@)
 }
 
 # Local Variables:
+# mode: perl
 # indent-tabs-mode: nil
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "my $VERSION = '"

diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index 248014261a8ee826ad88b1f2327cdb88e57744a4..f54176131672c15693cb6d6c819610ccb0a45359 100755 (executable)
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -1,7 +1,9 @@
-#!/usr/bin/perl -0777 -pi
+eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
+  & eval 'exec perl -wS -0777 -pi "$0" $argv:q'
+    if 0;
 # Update an FSF copyright year list to include the current year.
 
-my $VERSION = '2009-09-09.22:00'; # UTC
+my $VERSION = '2009-10-30.15:57'; # UTC
 
 # Copyright (C) 2009 Free Software Foundation, Inc.
 #
@@ -249,6 +251,7 @@ else
   }
 
 # Local variables:
+# mode: perl
 # indent-tabs-mode: nil
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "my $VERSION = '"

diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index abcdef2cda289b36f696324883b2cd899978eac8..793c9753e05f1f0ab7841582cef49287e8788f5c 100755 (executable)
--- a/build-aux/useless-if-before-free
+++ b/build-aux/useless-if-before-free
@@ -1,4 +1,6 @@
-#!/usr/bin/perl -T
+eval '(exit $?0)' && eval 'exec perl -wST "$0" ${1+"$@"}'
+  & eval 'exec perl -wST "$0" $argv:q'
+    if 0;
 # Detect instances of "if (p) free (p);".
 # Likewise for "if (p != NULL) free (p);".  And with braces.
 # Also detect "if (NULL != p) free (p);".
@@ -197,6 +199,7 @@ When modifying files, refuse to process anything other than a regular file.
 EOF
 
 ## Local Variables:
+## mode: perl
 ## indent-tabs-mode: nil
 ## eval: (add-hook 'write-file-hooks 'time-stamp)
 ## time-stamp-start: "my $VERSION = '"