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

r=justdave
a=justdave

diff --git a/UPGRADING-pre-2.8 b/UPGRADING-pre-2.8
index b01d9826943154dcd50f65ac0f4705ee41966b1e..9d0da5e2469e2497f6847fe108b508aef4bcb37c 100644 (file)
--- a/UPGRADING-pre-2.8
+++ b/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";

diff --git a/attachment.cgi b/attachment.cgi
index 81037a72379569b8d91de6f9241d078a16a0e6de..01201a1924454bef94892e2fb7ce04e331f269bb 100755 (executable)
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/buglist.cgi b/buglist.cgi
index 33a32f824b1285203116221e1c459d8a22da2ead..ff12dba35425fc34c9d8fd1e6becd2133dc2475b 100755 (executable)
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/checksetup.pl b/checksetup.pl
index a8ea7b1e1e6babd0f28f92a60a33bff5cb9b9a24..7a7548c01998ee1269ef66fbfada81ab14792c45 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -1,4 +1,4 @@
-#!/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

diff --git a/colchange.cgi b/colchange.cgi
index 22ff8c5629a31d3ebb2038eabdecd9bb452cfd0a..5e28a46229c5fbb33195fc765833092f4ee5f1e2 100755 (executable)
--- a/colchange.cgi
+++ b/colchange.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/collectstats.pl b/collectstats.pl
index bdc027a689cbe4a29e5e6068d22ae9229a223f67..5d72827b24d4c542813ec071dea2be2a899ddcba 100755 (executable)
--- a/collectstats.pl
+++ b/collectstats.pl
@@ -1,4 +1,4 @@
-#!/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

diff --git a/contrib/mysqld-watcher.pl b/contrib/mysqld-watcher.pl
index 30945a5ff5f42645e39afe53cb309fba299f6d10..a70e2250a38c6e6e348e71ff1144c116ca037d1a 100755 (executable)
--- a/contrib/mysqld-watcher.pl
+++ b/contrib/mysqld-watcher.pl
@@ -1,4 +1,4 @@
-#!/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

diff --git a/createaccount.cgi b/createaccount.cgi
index 0550f42b9026c9b14d17f28abdbc187aa8966e20..dec8e716c72f4dcbeca3a55b63a900f0bb29157c 100755 (executable)
--- a/createaccount.cgi
+++ b/createaccount.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/describecomponents.cgi b/describecomponents.cgi
index a1a6f0049c5d015e52cad4989af8a4ada3e65763..ec46b3d9de0d1d20ae23c840dd1ff5bc980c70e0 100755 (executable)
--- a/describecomponents.cgi
+++ b/describecomponents.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/describekeywords.cgi b/describekeywords.cgi
index 07f08d09b881a32d418a5781812242d1d2a1f7f5..0ff538b63a05449cb4b68a87a1c25619b400e4b5 100755 (executable)
--- a/describekeywords.cgi
+++ b/describekeywords.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/docs/makedocs.pl b/docs/makedocs.pl
index 7a245a470cfd1643e33379b278e7c4feb3f7baa3..d9d1aa7b633ffaf921c39526f5d2ed4013eda472 100644 (file)
--- a/docs/makedocs.pl
+++ b/docs/makedocs.pl
@@ -1,4 +1,4 @@
-#!/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

diff --git a/docs/sgml/faq.sgml b/docs/sgml/faq.sgml
index df80794cda4708d4bbeb7ab9b5d043f9b1b24977..d0f78b75a5142c6d017674fe402da7ac856249f8 100644 (file)
--- a/docs/sgml/faq.sgml
+++ b/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">

diff --git a/docs/sgml/installation.sgml b/docs/sgml/installation.sgml
index d1fa2401b71f4ef42e49ed61438ccf62a65a938e..9f94feb7a9d08da0ba3f58a987e4aba3eb719066 100644 (file)
--- a/docs/sgml/installation.sgml
+++ b/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>
 

diff --git a/docs/xml/faq.xml b/docs/xml/faq.xml
index df80794cda4708d4bbeb7ab9b5d043f9b1b24977..d0f78b75a5142c6d017674fe402da7ac856249f8 100644 (file)
--- a/docs/xml/faq.xml
+++ b/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">

diff --git a/docs/xml/installation.xml b/docs/xml/installation.xml
index d1fa2401b71f4ef42e49ed61438ccf62a65a938e..9f94feb7a9d08da0ba3f58a987e4aba3eb719066 100644 (file)
--- a/docs/xml/installation.xml
+++ b/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>
 

diff --git a/doeditparams.cgi b/doeditparams.cgi
index d37e8b2074a834a958cf2b772f4a2078af1d754c..48c39bc7ab4faba4221dce85d65fac95a86165e6 100755 (executable)
--- a/doeditparams.cgi
+++ b/doeditparams.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/duplicates.cgi b/duplicates.cgi
index 175fb649a77f16e08d5fc31493fcbc527fb291f5..a9a3031f37618fbf032595560aaf8793366baa36 100755 (executable)
--- a/duplicates.cgi
+++ b/duplicates.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/editcomponents.cgi b/editcomponents.cgi
index 4ee147453fd4c3b17a054847da24f27e523b1fbc..35c6426b2c028de290cede0982142800cbf4a514 100755 (executable)
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/editflagtypes.cgi b/editflagtypes.cgi
index 6a23012518bc3fc70a0dafe14befb4d79e502e30..d7794ff9368376ce86efd60915c40cb091b1ef42 100755 (executable)
--- a/editflagtypes.cgi
+++ b/editflagtypes.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/editgroups.cgi b/editgroups.cgi
index 1b793c6d354b425bab03335f8b35ef17789cf93e..ca653b77a800cf08dfe62c8e1d22119b994d1da5 100755 (executable)
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/editkeywords.cgi b/editkeywords.cgi
index ed298ef9bb76ecf5ca0bf7a3d2eb1d2cec2bbe23..4d11a4aaea1d8fb3d13e93e2bbefb73b98830e68 100755 (executable)
--- a/editkeywords.cgi
+++ b/editkeywords.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/editmilestones.cgi b/editmilestones.cgi
index e9d5d77e584ae087f29a55c5eb885220f4a99527..4bcf8b19b06e8dcc6d83a6f57f7d7ce40a667f1f 100755 (executable)
--- a/editmilestones.cgi
+++ b/editmilestones.cgi
@@ -1,4 +1,4 @@
-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -w
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 
 #

diff --git a/editparams.cgi b/editparams.cgi
index 372eb4d7bebc09b77359e13f58cb2f591557f81b..89099823f0a9ef1cd73c452e5e44aceca0e146da 100755 (executable)
--- a/editparams.cgi
+++ b/editparams.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/editproducts.cgi b/editproducts.cgi
index a34812c8ddbc614debc8d5fc27189ee21ca9fdb9..9592c02ad815b7627fe90e929e56dbb51214ae37 100755 (executable)
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/editusers.cgi b/editusers.cgi
index fee00a4e08bef544f9b50bc14a1def268aeb5ed8..4e423c2d5418135bec160a08dbea7cab4c16a37c 100755 (executable)
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/editversions.cgi b/editversions.cgi
index 5f420af43783bebf8e54bbe8f954ccfe3b9d88af..f3e828d9851f23cb35753f217f44ce7f71075bee 100755 (executable)
--- a/editversions.cgi
+++ b/editversions.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/enter_bug.cgi b/enter_bug.cgi
index 894de886f88c467e857b3a2cc6ade1353dfb6377..9784b81a3f022a4b56541f17c1cbf741f4020578 100755 (executable)
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/importxml.pl b/importxml.pl
index 50139ba40bcf13469ba99afb10ed7d68f8bbe445..7979dfcf909481955045e91366bd17a0476086f8 100755 (executable)
--- a/importxml.pl
+++ b/importxml.pl
@@ -1,4 +1,4 @@
-#!/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

diff --git a/index.cgi b/index.cgi
index f6e11ac21906781a3056f5b7e703410ea04eb875..1bdaa5351cb5b2eaea9aac95f572a05307cade25 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/long_list.cgi b/long_list.cgi
index 5bb19956c70d38791e662f89e47c23a037afa2f7..4c787a34e22c49d5278b1ab48463860384fbc50b 100755 (executable)
--- a/long_list.cgi
+++ b/long_list.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/move.pl b/move.pl
index ab0794243dbd2ee26b8d8ada8463387e958d5c0d..fa34e758de7a7fdfcf370dd9eb50236850d74b9d 100755 (executable)
--- a/move.pl
+++ b/move.pl
@@ -1,4 +1,4 @@
-#!/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

diff --git a/page.cgi b/page.cgi
index 960774cc4b8106560dc97923855c0b9a8792f341..48fafb38024ea9ba039b4bbd187ca432a801ea9c 100755 (executable)
--- a/page.cgi
+++ b/page.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/post_bug.cgi b/post_bug.cgi
index c319e80243196bab30675988f3a4fb543dc46cf2..670920d4324565aa6b3ddf5d700b9ebc3cf68309 100755 (executable)
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/process_bug.cgi b/process_bug.cgi
index 94c74fcf5f8373c5d47a454e5d59959fc9510eca..9476b7d68eb3b26f9102a27ec3af534f8b898079 100755 (executable)
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/query.cgi b/query.cgi
index f6f8c87a5b00f2e027a1d891704e200a90fea31a..470e3dfbdbabb9605db698eedf38db255ef3b6ad 100755 (executable)
--- a/query.cgi
+++ b/query.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/queryhelp.cgi b/queryhelp.cgi
index eb9893bd8b05fb6bc062a9f93f748dfd20780739..175605d9a89b21974ca942a0785a4a2965c658a5 100755 (executable)
--- a/queryhelp.cgi
+++ b/queryhelp.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/quips.cgi b/quips.cgi
index 067fa950e3096ce2a6c106dce76dadd378b20c48..02109fcdaca87ca4518b7e4c1451ee3b7c7d0c45 100755 (executable)
--- a/quips.cgi
+++ b/quips.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/relogin.cgi b/relogin.cgi
index 493f5c200f46fc13644a8734bff7b2a6fb5c91e8..c0182de491a4a2d896edfb39aa757521e1d11fa7 100755 (executable)
--- a/relogin.cgi
+++ b/relogin.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/report.cgi b/report.cgi
index 9978e2002f460f6683ac1e2f7900e4a8f95b1bf6..2a081606b0a53c8041619bce05c21125a371edd4 100755 (executable)
--- a/report.cgi
+++ b/report.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/reports.cgi b/reports.cgi
index 5c802ccfee410fe1ccc82cc197649d8068eaf888..d3b1d943171e6a1263d681b3db6457d91c3a8782 100755 (executable)
--- a/reports.cgi
+++ b/reports.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/request.cgi b/request.cgi
index 29c19f27f7f87bf2e7f1c63424469263c6b506c5..7909163594935301d55a97eded8145668f9eeace 100755 (executable)
--- a/request.cgi
+++ b/request.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/runtests.pl b/runtests.pl
index 376a4a1e4717cd5bf222ef6bd45e9f7e064b2207..d5059fdc0925f1ebcd62e8e841df5171daaa3454 100755 (executable)
--- a/runtests.pl
+++ b/runtests.pl
@@ -1,4 +1,4 @@
-#!/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

diff --git a/runtests.sh b/runtests.sh
index 164ec3acffea628eab712cb922932481ec90e5a0..d6f3d1a54f1c27dfa7d0f863acd6b8dee8d531ec 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,10 +1,3 @@
 #!/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 $*

diff --git a/sanitycheck.cgi b/sanitycheck.cgi
index a28858f433d281755f0dc8a7827b545993fa1aa0..16a12396782af4a2a2c1dabbb9c8e3de81d6f4b5 100755 (executable)
--- a/sanitycheck.cgi
+++ b/sanitycheck.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/show_activity.cgi b/show_activity.cgi
index 14b4149ba2649542deb530708e7a23a8d6102218..c748c3df7621c9eeb40eed91b915495a1fcfb3aa 100755 (executable)
--- a/show_activity.cgi
+++ b/show_activity.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/show_bug.cgi b/show_bug.cgi
index 80e53e61632d70912396ae55dc58c76070eb8ef9..c4c05f42cc842ad2b3037ff870976e0978d88983 100755 (executable)
--- a/show_bug.cgi
+++ b/show_bug.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/showattachment.cgi b/showattachment.cgi
index 2471332fce395b9fc50ca9bac60c6f98e604240f..bfe9ef9888a987d533534ac2047b6c0174f32674 100755 (executable)
--- a/showattachment.cgi
+++ b/showattachment.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 77a1d4dc020b93d81e0c354159d7a69794e65fb6..fd0a75cb4120da89a68792514f3cc9baac79584c 100755 (executable)
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/showdependencytree.cgi b/showdependencytree.cgi
index 4ee9e4cc83a8f38aa4ea55c0b0895e8a80782e35..9149296b75d26a58491d2d78db532712eab7e790 100755 (executable)
--- a/showdependencytree.cgi
+++ b/showdependencytree.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/sidebar.cgi b/sidebar.cgi
index 7cf823aaaf005dd05558ee4a94895a15cb457960..7a054abc2b14a26543d1693d9ed2b0ce44244a21 100755 (executable)
--- a/sidebar.cgi
+++ b/sidebar.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/t/002goodperl.t b/t/002goodperl.t
index f6f14adb56606f7d84eac38f9763e943767a8d37..1cfb6a06f25a87172878fcd2babfb47abb989ea8 100644 (file)
--- a/t/002goodperl.t
+++ b/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");

diff --git a/token.cgi b/token.cgi
index 9a7efb5c5a2a1cf1ed8e8ded655dbc8f32645e94..5da824bae290bcfbc99f29df87e7bad513b50e05 100755 (executable)
--- a/token.cgi
+++ b/token.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/userprefs.cgi b/userprefs.cgi
index 271dbd84710c1437cc514af419f213a82f0f6eb5..156c6a2ddf3c66a807ef5dc1c72e545b4a934a8c 100755 (executable)
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/votes.cgi b/votes.cgi
index b8fbfa8474a8d6f629ae712ae759e76f011225fc..6b35fc0276651bca697862dd86ede76b138f9a51 100755 (executable)
--- a/votes.cgi
+++ b/votes.cgi
@@ -1,4 +1,4 @@
-#!/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

diff --git a/whineatnews.pl b/whineatnews.pl
index a0a30205e6da245cb22e81778284806aa4cf00aa..330cf7cbdba666022f8d7f42905c6199e336a896 100755 (executable)
--- a/whineatnews.pl
+++ b/whineatnews.pl
@@ -1,4 +1,4 @@
-#!/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

diff --git a/xml.cgi b/xml.cgi
index f93c0e5c0efb9865dd80287c18ac9f4d056140b9..103838f86957e2c2a1fb4c1c5144b13aebe802e3 100755 (executable)
--- a/xml.cgi
+++ b/xml.cgi
@@ -1,4 +1,4 @@
-#!/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