summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjake%bugzilla.org <>2003-03-27 09:06:37 +0100
committerjake%bugzilla.org <>2003-03-27 09:06:37 +0100
commit9665c0e6a0ee98cdd113e11b86d3efab474464c0 (patch)
tree53f75f6c8f1207c6dfba7209709e8a4bb9cca27f
parentd97f96781715a3d13dc99deb616aa63c4aeb42d5 (diff)
downloadbugzilla-9665c0e6a0ee98cdd113e11b86d3efab474464c0.tar.gz
bugzilla-9665c0e6a0ee98cdd113e11b86d3efab474464c0.tar.xz
Bug 196433 - Bugzilla now uses /usr/bin/perl as the shebang line
r=justdave a=justdave
-rw-r--r--UPGRADING-pre-2.84
-rwxr-xr-xattachment.cgi2
-rwxr-xr-xbuglist.cgi2
-rwxr-xr-xchecksetup.pl2
-rwxr-xr-xcolchange.cgi2
-rwxr-xr-xcollectstats.pl2
-rwxr-xr-xcontrib/mysqld-watcher.pl2
-rwxr-xr-xcreateaccount.cgi2
-rwxr-xr-xdescribecomponents.cgi2
-rwxr-xr-xdescribekeywords.cgi2
-rw-r--r--docs/makedocs.pl2
-rw-r--r--docs/sgml/faq.sgml42
-rw-r--r--docs/sgml/installation.sgml37
-rw-r--r--docs/xml/faq.xml42
-rw-r--r--docs/xml/installation.xml37
-rwxr-xr-xdoeditparams.cgi2
-rwxr-xr-xduplicates.cgi2
-rwxr-xr-xeditcomponents.cgi2
-rwxr-xr-xeditflagtypes.cgi2
-rwxr-xr-xeditgroups.cgi2
-rwxr-xr-xeditkeywords.cgi2
-rwxr-xr-xeditmilestones.cgi2
-rwxr-xr-xeditparams.cgi2
-rwxr-xr-xeditproducts.cgi2
-rwxr-xr-xeditusers.cgi2
-rwxr-xr-xeditversions.cgi2
-rwxr-xr-xenter_bug.cgi2
-rwxr-xr-ximportxml.pl2
-rwxr-xr-xindex.cgi2
-rwxr-xr-xlong_list.cgi2
-rwxr-xr-xmove.pl2
-rwxr-xr-xpage.cgi2
-rwxr-xr-xpost_bug.cgi2
-rwxr-xr-xprocess_bug.cgi2
-rwxr-xr-xquery.cgi2
-rwxr-xr-xqueryhelp.cgi2
-rwxr-xr-xquips.cgi2
-rwxr-xr-xrelogin.cgi2
-rwxr-xr-xreport.cgi2
-rwxr-xr-xreports.cgi2
-rwxr-xr-xrequest.cgi2
-rwxr-xr-xruntests.pl2
-rwxr-xr-xruntests.sh9
-rwxr-xr-xsanitycheck.cgi2
-rwxr-xr-xshow_activity.cgi2
-rwxr-xr-xshow_bug.cgi2
-rwxr-xr-xshowattachment.cgi2
-rwxr-xr-xshowdependencygraph.cgi2
-rwxr-xr-xshowdependencytree.cgi2
-rwxr-xr-xsidebar.cgi2
-rw-r--r--t/002goodperl.t4
-rwxr-xr-xtoken.cgi2
-rwxr-xr-xuserprefs.cgi2
-rwxr-xr-xvotes.cgi2
-rwxr-xr-xwhineatnews.pl2
-rwxr-xr-xxml.cgi2
56 files changed, 116 insertions, 157 deletions
diff --git a/UPGRADING-pre-2.8 b/UPGRADING-pre-2.8
index b01d98269..9d0da5e24 100644
--- 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 81037a723..01201a192 100755
--- 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 33a32f824..ff12dba35 100755
--- 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 a8ea7b1e1..7a7548c01 100755
--- 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 22ff8c562..5e28a4622 100755
--- 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 bdc027a68..5d72827b2 100755
--- 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 30945a5ff..a70e2250a 100755
--- 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 0550f42b9..dec8e716c 100755
--- 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 a1a6f0049..ec46b3d9d 100755
--- 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 07f08d09b..0ff538b63 100755
--- 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 7a245a470..d9d1aa7b6 100644
--- 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 df80794cd..d0f78b75a 100644
--- 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 d1fa2401b..9f94feb7a 100644
--- 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 df80794cd..d0f78b75a 100644
--- 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 d1fa2401b..9f94feb7a 100644
--- 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 d37e8b207..48c39bc7a 100755
--- 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 175fb649a..a9a3031f3 100755
--- 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 4ee147453..35c6426b2 100755
--- 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 6a2301251..d7794ff93 100755
--- 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 1b793c6d3..ca653b77a 100755
--- 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 ed298ef9b..4d11a4aae 100755
--- 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 e9d5d77e5..4bcf8b19b 100755
--- 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 372eb4d7b..89099823f 100755
--- 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 a34812c8d..9592c02ad 100755
--- 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 fee00a4e0..4e423c2d5 100755
--- 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 5f420af43..f3e828d98 100755
--- 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 894de886f..9784b81a3 100755
--- 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 50139ba40..7979dfcf9 100755
--- 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 f6e11ac21..1bdaa5351 100755
--- 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 5bb19956c..4c787a34e 100755
--- 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 ab0794243..fa34e758d 100755
--- 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 960774cc4..48fafb380 100755
--- 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 c319e8024..670920d43 100755
--- 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 94c74fcf5..9476b7d68 100755
--- 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 f6f8c87a5..470e3dfbd 100755
--- 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 eb9893bd8..175605d9a 100755
--- 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 067fa950e..02109fcda 100755
--- 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 493f5c200..c0182de49 100755
--- 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 9978e2002..2a081606b 100755
--- 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 5c802ccfe..d3b1d9431 100755
--- 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 29c19f27f..790916359 100755
--- 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 376a4a1e4..d5059fdc0 100755
--- 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 164ec3acf..d6f3d1a54 100755
--- 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 a28858f43..16a123967 100755
--- 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 14b4149ba..c748c3df7 100755
--- 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 80e53e616..c4c05f42c 100755
--- 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 2471332fc..bfe9ef988 100755
--- 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 77a1d4dc0..fd0a75cb4 100755
--- 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 4ee9e4cc8..9149296b7 100755
--- 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 7cf823aaa..7a054abc2 100755
--- 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 f6f14adb5..1cfb6a06f 100644
--- 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 9a7efb5c5..5da824bae 100755
--- 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 271dbd847..156c6a2dd 100755
--- 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 b8fbfa847..6b35fc027 100755
--- 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 a0a30205e..330cf7cbd 100755
--- 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 f93c0e5c0..103838f86 100755
--- 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