Bug 196433 - Bugzilla now uses /usr/bin/perl as the shebang line

UPGRADING-pre-2.8

@@ -73,7 +73,7 @@ was.  Nothing uses this yet, but it still should be recorded.
 
 You should also run this script to populate the new field:
 
-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 use diagnostics;
 use strict;
 require "globals.pl";
@@ -149,7 +149,7 @@ that submitted the text.  This bug has been fixed, so that no further changes
 like that will happen.  But to fix problems that have already crept into your
 database, you can run the following perl script (which is slow and ugly, but
 does work:)
-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 use diagnostics;
 use strict;
 require "globals.pl";

attachment.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

buglist.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

checksetup.pl

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

colchange.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

collectstats.pl

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

contrib/mysqld-watcher.pl

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 #
 # The contents of this file are subject to the Mozilla Public
 # License Version 1.1 (the "License"); you may not use this file

createaccount.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

describecomponents.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

describekeywords.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

docs/makedocs.pl

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

docs/sgml/faq.sgml

@@ -204,25 +204,43 @@
       <qandaentry>
 	<question id="faq-general-bonsaitools">
 	  <para>
-	    Why do the scripts say "/usr/bonsaitools/bin/perl" instead of
-	    "/usr/bin/perl" or something else?
+	    What is <filename>/usr/bonsaitools/bin/perl</filename>?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	     Mozilla.org uses /usr/bonsaitools/bin/perl, because originally
-       Terry wanted a place to put a version of Perl and other tools 
-       that was strictly under his control. 
-    </para>
-		<para>
-		  We always recommend that, if possible, you keep the path
-		  as /usr/bonsaitools/bin/perl, and simply add symlink.  
-      This will make upgrading
-		  your Bugzilla much easier in the future.
-		</para>
+            Bugzilla used to have the path to perl on the shebang line set to
+            <filename>/usr/bonsaitools/bin/perl</filename> because when
+            Terry first started writing the code for mozilla.org he needed a
+            version of Perl and other tools that were completely under his
+            control.  This location was abandoned for the 2.18 release in favor
+            of the more sensible <filename>/usr/bin/perl</filename>.  If you
+            installed an older verion of Bugzilla and created the symlink we
+            suggested, you can remove it now (provided that you don't have
+            anything else, such as Bonsai, using it and you don't intend to
+            reinstall an older version of Bugzilla).
+          </para>
 	</answer>
       </qandaentry>
 
+      <qandaentry>
+        <question id="faq-general-perlpath">
+          <para>
+            My perl is not located at <filename>/usr/bin/perl</filename>, is
+            there an easy way to change it everywhere it needs to be changed?
+          </para>
+        </question>
+        <answer>
+          <para>
+            Yes, the following bit of perl magic will change all the shebang
+            lines.  Be sure to change <filename>/usr/local/bin/perl</filename>
+            to your path to the perl binary.
+          </para>
+          <programlisting>
+perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
+          </programlisting>
+        </answer>
+      </qandaentry>
 
       <qandaentry>
 	<question id="faq-general-cookie">

docs/sgml/installation.sgml

@@ -522,41 +522,6 @@
       until you run the post-install 
       <filename>checksetup.pl</filename>
       script, which locks down your installation.</para>
-
-      <para>Lastly, you'll need to set up a symbolic link to 
-      <filename>/usr/bonsaitools/bin/perl</filename>
-      for the correct location of your Perl executable (probably 
-      <filename>/usr/bin/perl</filename>). 
-      Otherwise you must hack all the .cgi files to change where they look
-      for Perl. This can be done using the following Perl one-liner, but 
-      I suggest using the symlink approach to avoid upgrade hassles.
-      </para>
-
-      <note>
-        <para><quote>Bonsaitools</quote> is the name Terry Weissman, the
-	original author of Bugzilla, created
-	for his suite of webtools at the time he created Bugzilla and several
-	other tools in use at mozilla.org.  He created a directory, 
-	<filename>/usr/bonsaitools</filename> to house his specific versions
-	of perl and other utilities.  This usage is still current at
-	<ulink url="http://bugzilla.mozilla.org/">bugzilla.mozilla.org</ulink>,
-	but in general most other places do not use it.  You can either edit
-	the paths at the start of each perl file to the correct location of
-	perl on your system, or simply bow to history and create a
-	<filename>/usr/bonsaitools</filename> and <filename>/usr/bonsaitools/bin
-	</filename> directory, placing a symlink to perl on your system
-	inside <filename>/usr/bonsaitools/bin</filename>
-	</para>
-      </note>
-      
-      <para> 
-        <programlisting>
-perl -pi -e 's@#\!/usr/bonsaitools/bin/perl@#\!/usr/bin/perl@' *cgi *pl Bug.pm syncshadowdb
-        </programlisting>
-
-        Change <filename>/usr/bin/perl</filename> to match the location
-        of Perl on your machine.
-      </para>
     </section>
 
     <section>
@@ -1185,7 +1150,7 @@ system("C:\\perl\\bin\\perl", "$webdotbase","-Tpng","-o","$pngfilename","$filena
           url="http://httpd.apache.org/docs-2.0/mod/core.html#scriptinterpretersource">ScriptInterpreterSource</ulink>
           directive in your Apache config, if you don't do this, you'll have
           to modify the first line of every script to contain your path to
-          perl instead of <filename>/usr/bonsaitools/bin/perl</filename>.
+          perl instead of <filename>/usr/bin/perl</filename>.
           </para>
         </note>
 

docs/xml/faq.xml

@@ -204,25 +204,43 @@
       <qandaentry>
 	<question id="faq-general-bonsaitools">
 	  <para>
-	    Why do the scripts say "/usr/bonsaitools/bin/perl" instead of
-	    "/usr/bin/perl" or something else?
+	    What is <filename>/usr/bonsaitools/bin/perl</filename>?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	     Mozilla.org uses /usr/bonsaitools/bin/perl, because originally
-       Terry wanted a place to put a version of Perl and other tools 
-       that was strictly under his control. 
-    </para>
-		<para>
-		  We always recommend that, if possible, you keep the path
-		  as /usr/bonsaitools/bin/perl, and simply add symlink.  
-      This will make upgrading
-		  your Bugzilla much easier in the future.
-		</para>
+            Bugzilla used to have the path to perl on the shebang line set to
+            <filename>/usr/bonsaitools/bin/perl</filename> because when
+            Terry first started writing the code for mozilla.org he needed a
+            version of Perl and other tools that were completely under his
+            control.  This location was abandoned for the 2.18 release in favor
+            of the more sensible <filename>/usr/bin/perl</filename>.  If you
+            installed an older verion of Bugzilla and created the symlink we
+            suggested, you can remove it now (provided that you don't have
+            anything else, such as Bonsai, using it and you don't intend to
+            reinstall an older version of Bugzilla).
+          </para>
 	</answer>
       </qandaentry>
 
+      <qandaentry>
+        <question id="faq-general-perlpath">
+          <para>
+            My perl is not located at <filename>/usr/bin/perl</filename>, is
+            there an easy way to change it everywhere it needs to be changed?
+          </para>
+        </question>
+        <answer>
+          <para>
+            Yes, the following bit of perl magic will change all the shebang
+            lines.  Be sure to change <filename>/usr/local/bin/perl</filename>
+            to your path to the perl binary.
+          </para>
+          <programlisting>
+perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
+          </programlisting>
+        </answer>
+      </qandaentry>
 
       <qandaentry>
 	<question id="faq-general-cookie">

docs/xml/installation.xml

@@ -522,41 +522,6 @@
       until you run the post-install 
       <filename>checksetup.pl</filename>
       script, which locks down your installation.</para>
-
-      <para>Lastly, you'll need to set up a symbolic link to 
-      <filename>/usr/bonsaitools/bin/perl</filename>
-      for the correct location of your Perl executable (probably 
-      <filename>/usr/bin/perl</filename>). 
-      Otherwise you must hack all the .cgi files to change where they look
-      for Perl. This can be done using the following Perl one-liner, but 
-      I suggest using the symlink approach to avoid upgrade hassles.
-      </para>
-
-      <note>
-        <para><quote>Bonsaitools</quote> is the name Terry Weissman, the
-	original author of Bugzilla, created
-	for his suite of webtools at the time he created Bugzilla and several
-	other tools in use at mozilla.org.  He created a directory, 
-	<filename>/usr/bonsaitools</filename> to house his specific versions
-	of perl and other utilities.  This usage is still current at
-	<ulink url="http://bugzilla.mozilla.org/">bugzilla.mozilla.org</ulink>,
-	but in general most other places do not use it.  You can either edit
-	the paths at the start of each perl file to the correct location of
-	perl on your system, or simply bow to history and create a
-	<filename>/usr/bonsaitools</filename> and <filename>/usr/bonsaitools/bin
-	</filename> directory, placing a symlink to perl on your system
-	inside <filename>/usr/bonsaitools/bin</filename>
-	</para>
-      </note>
-      
-      <para> 
-        <programlisting>
-perl -pi -e 's@#\!/usr/bonsaitools/bin/perl@#\!/usr/bin/perl@' *cgi *pl Bug.pm syncshadowdb
-        </programlisting>
-
-        Change <filename>/usr/bin/perl</filename> to match the location
-        of Perl on your machine.
-      </para>
     </section>
 
     <section>
@@ -1185,7 +1150,7 @@ system("C:\\perl\\bin\\perl", "$webdotbase","-Tpng","-o","$pngfilename","$filena
           url="http://httpd.apache.org/docs-2.0/mod/core.html#scriptinterpretersource">ScriptInterpreterSource</ulink>
           directive in your Apache config, if you don't do this, you'll have
           to modify the first line of every script to contain your path to
-          perl instead of <filename>/usr/bonsaitools/bin/perl</filename>.
+          perl instead of <filename>/usr/bin/perl</filename>.
           </para>
         </note>
 

doeditparams.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

duplicates.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

editcomponents.cgi

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

editflagtypes.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

editgroups.cgi

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

editkeywords.cgi

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

editmilestones.cgi

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 
 #

editparams.cgi

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

editproducts.cgi

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

editusers.cgi

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

editversions.cgi

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

enter_bug.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

importxml.pl

-#!/usr/bonsaitools/bin/perl -w 
+#!/usr/bin/perl -w 
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

index.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

long_list.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

move.pl

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

page.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

post_bug.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

process_bug.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

query.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

queryhelp.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

quips.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

relogin.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

report.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

reports.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

request.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

runtests.pl

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

runtests.sh

 #!/bin/sh
 
-TEST_VERBOSE=0
-for f in $*; do
-  if [ "$f" = "--verbose" ] ; then
-    TEST_VERBOSE="--verbose"
-  fi
-done
-
-/usr/bonsaitools/bin/perl runtests.pl ${TEST_VERBOSE}
+/usr/bin/perl runtests.pl $*

sanitycheck.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

show_activity.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

show_bug.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

showattachment.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

showdependencygraph.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

showdependencytree.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

sidebar.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

t/002goodperl.t

@@ -48,7 +48,7 @@ foreach my $file (@testitems) {
     $file =~ m/.*\.(.*)/;
     my $ext = $1;
 
-    if ($file_line1 !~ /\/usr\/bonsaitools\/bin\/perl/) {
+    if ($file_line1 !~ m#/usr/bin/perl#) {
         ok(1,"$file does not have a shebang");	
     } else {
         my $flags;
@@ -71,7 +71,7 @@ foreach my $file (@testitems) {
             next;
         }
 
-        if ($file_line1 =~ m#/usr/bonsaitools/bin/perl -$flags#) {
+        if ($file_line1 =~ m#/usr/bin/perl -$flags#) {
             ok(1,"$file uses -$flags");
         } else {
             ok(0,"$file is MISSING -$flags --WARNING");

token.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

userprefs.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

votes.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

whineatnews.pl

-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

xml.cgi

-#!/usr/bonsaitools/bin/perl -wT
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public