From 774aa5e232fca6646478d46abcfa282e6357ee31 Mon Sep 17 00:00:00 2001 From: "jake%bugzilla.org" Date: Thu, 27 Mar 2003 00:07:02 +0000 Subject: [PATCH] Bug 196433 - Bugzilla now uses /usr/bin/perl as the shebang line r=justdave a=justdave --- webtools/bugzilla/UPGRADING-pre-2.8 | 4 +- webtools/bugzilla/attachment.cgi | 2 +- webtools/bugzilla/buglist.cgi | 2 +- webtools/bugzilla/checksetup.pl | 2 +- webtools/bugzilla/colchange.cgi | 2 +- webtools/bugzilla/collectstats.pl | 2 +- webtools/bugzilla/contrib/mysqld-watcher.pl | 2 +- webtools/bugzilla/createaccount.cgi | 2 +- webtools/bugzilla/describecomponents.cgi | 2 +- webtools/bugzilla/describekeywords.cgi | 2 +- webtools/bugzilla/docs/makedocs.pl | 2 +- webtools/bugzilla/docs/sgml/faq.sgml | 42 +++++++++++++------ webtools/bugzilla/docs/sgml/installation.sgml | 37 +--------------- webtools/bugzilla/docs/xml/faq.xml | 42 +++++++++++++------ webtools/bugzilla/docs/xml/installation.xml | 37 +--------------- webtools/bugzilla/doeditparams.cgi | 2 +- webtools/bugzilla/duplicates.cgi | 2 +- webtools/bugzilla/editcomponents.cgi | 2 +- webtools/bugzilla/editflagtypes.cgi | 2 +- webtools/bugzilla/editgroups.cgi | 2 +- webtools/bugzilla/editkeywords.cgi | 2 +- webtools/bugzilla/editmilestones.cgi | 2 +- webtools/bugzilla/editparams.cgi | 2 +- webtools/bugzilla/editproducts.cgi | 2 +- webtools/bugzilla/editusers.cgi | 2 +- webtools/bugzilla/editversions.cgi | 2 +- webtools/bugzilla/enter_bug.cgi | 2 +- webtools/bugzilla/importxml.pl | 2 +- webtools/bugzilla/index.cgi | 2 +- webtools/bugzilla/long_list.cgi | 2 +- webtools/bugzilla/move.pl | 2 +- webtools/bugzilla/page.cgi | 2 +- webtools/bugzilla/post_bug.cgi | 2 +- webtools/bugzilla/process_bug.cgi | 2 +- webtools/bugzilla/query.cgi | 2 +- webtools/bugzilla/queryhelp.cgi | 2 +- webtools/bugzilla/quips.cgi | 2 +- webtools/bugzilla/relogin.cgi | 2 +- webtools/bugzilla/report.cgi | 2 +- webtools/bugzilla/reports.cgi | 2 +- webtools/bugzilla/request.cgi | 2 +- webtools/bugzilla/runtests.pl | 2 +- webtools/bugzilla/runtests.sh | 10 ----- webtools/bugzilla/sanitycheck.cgi | 2 +- webtools/bugzilla/show_activity.cgi | 2 +- webtools/bugzilla/show_bug.cgi | 2 +- webtools/bugzilla/showattachment.cgi | 2 +- webtools/bugzilla/showdependencygraph.cgi | 2 +- webtools/bugzilla/showdependencytree.cgi | 2 +- webtools/bugzilla/sidebar.cgi | 2 +- webtools/bugzilla/t/002goodperl.t | 4 +- webtools/bugzilla/token.cgi | 2 +- webtools/bugzilla/userprefs.cgi | 2 +- webtools/bugzilla/votes.cgi | 2 +- webtools/bugzilla/whineatnews.pl | 2 +- webtools/bugzilla/xml.cgi | 2 +- 56 files changed, 115 insertions(+), 159 deletions(-) diff --git a/webtools/bugzilla/UPGRADING-pre-2.8 b/webtools/bugzilla/UPGRADING-pre-2.8 index b01d9826943..9d0da5e2469 100644 --- a/webtools/bugzilla/UPGRADING-pre-2.8 +++ b/webtools/bugzilla/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/webtools/bugzilla/attachment.cgi b/webtools/bugzilla/attachment.cgi index 81037a72379..01201a19244 100755 --- a/webtools/bugzilla/attachment.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/buglist.cgi b/webtools/bugzilla/buglist.cgi index 33a32f824b1..ff12dba3542 100755 --- a/webtools/bugzilla/buglist.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/checksetup.pl b/webtools/bugzilla/checksetup.pl index a8ea7b1e1e6..7a7548c0199 100755 --- a/webtools/bugzilla/checksetup.pl +++ b/webtools/bugzilla/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/webtools/bugzilla/colchange.cgi b/webtools/bugzilla/colchange.cgi index 22ff8c5629a..5e28a46229c 100755 --- a/webtools/bugzilla/colchange.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/collectstats.pl b/webtools/bugzilla/collectstats.pl index bdc027a689c..5d72827b24d 100755 --- a/webtools/bugzilla/collectstats.pl +++ b/webtools/bugzilla/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/webtools/bugzilla/contrib/mysqld-watcher.pl b/webtools/bugzilla/contrib/mysqld-watcher.pl index 30945a5ff5f..a70e2250a38 100755 --- a/webtools/bugzilla/contrib/mysqld-watcher.pl +++ b/webtools/bugzilla/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/webtools/bugzilla/createaccount.cgi b/webtools/bugzilla/createaccount.cgi index 0550f42b902..dec8e716c72 100755 --- a/webtools/bugzilla/createaccount.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/describecomponents.cgi b/webtools/bugzilla/describecomponents.cgi index a1a6f0049c5..ec46b3d9de0 100755 --- a/webtools/bugzilla/describecomponents.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/describekeywords.cgi b/webtools/bugzilla/describekeywords.cgi index 07f08d09b88..0ff538b63a0 100755 --- a/webtools/bugzilla/describekeywords.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/docs/makedocs.pl b/webtools/bugzilla/docs/makedocs.pl index 7a245a470cf..d9d1aa7b633 100644 --- a/webtools/bugzilla/docs/makedocs.pl +++ b/webtools/bugzilla/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/webtools/bugzilla/docs/sgml/faq.sgml b/webtools/bugzilla/docs/sgml/faq.sgml index df80794cda4..d0f78b75a51 100644 --- a/webtools/bugzilla/docs/sgml/faq.sgml +++ b/webtools/bugzilla/docs/sgml/faq.sgml @@ -204,25 +204,43 @@ - Why do the scripts say "/usr/bonsaitools/bin/perl" instead of - "/usr/bin/perl" or something else? + What is /usr/bonsaitools/bin/perl? - 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. - - - 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. - + Bugzilla used to have the path to perl on the shebang line set to + /usr/bonsaitools/bin/perl 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 /usr/bin/perl. 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). + + + + + My perl is not located at /usr/bin/perl, is + there an easy way to change it everywhere it needs to be changed? + + + + + Yes, the following bit of perl magic will change all the shebang + lines. Be sure to change /usr/local/bin/perl + to your path to the perl binary. + + +perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl + + + diff --git a/webtools/bugzilla/docs/sgml/installation.sgml b/webtools/bugzilla/docs/sgml/installation.sgml index d1fa2401b71..9f94feb7a9d 100644 --- a/webtools/bugzilla/docs/sgml/installation.sgml +++ b/webtools/bugzilla/docs/sgml/installation.sgml @@ -522,41 +522,6 @@ until you run the post-install checksetup.pl script, which locks down your installation. - - Lastly, you'll need to set up a symbolic link to - /usr/bonsaitools/bin/perl - for the correct location of your Perl executable (probably - /usr/bin/perl). - 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. - - - - Bonsaitools 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, - /usr/bonsaitools to house his specific versions - of perl and other utilities. This usage is still current at - bugzilla.mozilla.org, - 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 - /usr/bonsaitools and /usr/bonsaitools/bin - directory, placing a symlink to perl on your system - inside /usr/bonsaitools/bin - - - - - -perl -pi -e 's@#\!/usr/bonsaitools/bin/perl@#\!/usr/bin/perl@' *cgi *pl Bug.pm syncshadowdb - - - Change /usr/bin/perl to match the location - of Perl on your machine. -
@@ -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 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 /usr/bonsaitools/bin/perl. + perl instead of /usr/bin/perl. diff --git a/webtools/bugzilla/docs/xml/faq.xml b/webtools/bugzilla/docs/xml/faq.xml index df80794cda4..d0f78b75a51 100644 --- a/webtools/bugzilla/docs/xml/faq.xml +++ b/webtools/bugzilla/docs/xml/faq.xml @@ -204,25 +204,43 @@ - Why do the scripts say "/usr/bonsaitools/bin/perl" instead of - "/usr/bin/perl" or something else? + What is /usr/bonsaitools/bin/perl? - 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. - - - 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. - + Bugzilla used to have the path to perl on the shebang line set to + /usr/bonsaitools/bin/perl 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 /usr/bin/perl. 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). + + + + + My perl is not located at /usr/bin/perl, is + there an easy way to change it everywhere it needs to be changed? + + + + + Yes, the following bit of perl magic will change all the shebang + lines. Be sure to change /usr/local/bin/perl + to your path to the perl binary. + + +perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl + + + diff --git a/webtools/bugzilla/docs/xml/installation.xml b/webtools/bugzilla/docs/xml/installation.xml index d1fa2401b71..9f94feb7a9d 100644 --- a/webtools/bugzilla/docs/xml/installation.xml +++ b/webtools/bugzilla/docs/xml/installation.xml @@ -522,41 +522,6 @@ until you run the post-install checksetup.pl script, which locks down your installation. - - Lastly, you'll need to set up a symbolic link to - /usr/bonsaitools/bin/perl - for the correct location of your Perl executable (probably - /usr/bin/perl). - 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. - - - - Bonsaitools 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, - /usr/bonsaitools to house his specific versions - of perl and other utilities. This usage is still current at - bugzilla.mozilla.org, - 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 - /usr/bonsaitools and /usr/bonsaitools/bin - directory, placing a symlink to perl on your system - inside /usr/bonsaitools/bin - - - - - -perl -pi -e 's@#\!/usr/bonsaitools/bin/perl@#\!/usr/bin/perl@' *cgi *pl Bug.pm syncshadowdb - - - Change /usr/bin/perl to match the location - of Perl on your machine. -
@@ -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 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 /usr/bonsaitools/bin/perl. + perl instead of /usr/bin/perl. diff --git a/webtools/bugzilla/doeditparams.cgi b/webtools/bugzilla/doeditparams.cgi index d37e8b2074a..48c39bc7ab4 100755 --- a/webtools/bugzilla/doeditparams.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/duplicates.cgi b/webtools/bugzilla/duplicates.cgi index 175fb649a77..a9a3031f376 100755 --- a/webtools/bugzilla/duplicates.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/editcomponents.cgi b/webtools/bugzilla/editcomponents.cgi index 4ee147453fd..35c6426b2c0 100755 --- a/webtools/bugzilla/editcomponents.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/editflagtypes.cgi b/webtools/bugzilla/editflagtypes.cgi index 6a23012518b..d7794ff9368 100755 --- a/webtools/bugzilla/editflagtypes.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/editgroups.cgi b/webtools/bugzilla/editgroups.cgi index 1b793c6d354..ca653b77a80 100755 --- a/webtools/bugzilla/editgroups.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/editkeywords.cgi b/webtools/bugzilla/editkeywords.cgi index ed298ef9bb7..4d11a4aaea1 100755 --- a/webtools/bugzilla/editkeywords.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/editmilestones.cgi b/webtools/bugzilla/editmilestones.cgi index e9d5d77e584..4bcf8b19b06 100755 --- a/webtools/bugzilla/editmilestones.cgi +++ b/webtools/bugzilla/editmilestones.cgi @@ -1,4 +1,4 @@ -#!/usr/bonsaitools/bin/perl -w +#!/usr/bin/perl -w # -*- Mode: perl; indent-tabs-mode: nil -*- # diff --git a/webtools/bugzilla/editparams.cgi b/webtools/bugzilla/editparams.cgi index 372eb4d7beb..89099823f0a 100755 --- a/webtools/bugzilla/editparams.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/editproducts.cgi b/webtools/bugzilla/editproducts.cgi index a34812c8ddb..9592c02ad81 100755 --- a/webtools/bugzilla/editproducts.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/editusers.cgi b/webtools/bugzilla/editusers.cgi index fee00a4e08b..4e423c2d541 100755 --- a/webtools/bugzilla/editusers.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/editversions.cgi b/webtools/bugzilla/editversions.cgi index 5f420af4378..f3e828d9851 100755 --- a/webtools/bugzilla/editversions.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/enter_bug.cgi b/webtools/bugzilla/enter_bug.cgi index 894de886f88..9784b81a3f0 100755 --- a/webtools/bugzilla/enter_bug.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/importxml.pl b/webtools/bugzilla/importxml.pl index 50139ba40bc..7979dfcf909 100755 --- a/webtools/bugzilla/importxml.pl +++ b/webtools/bugzilla/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/webtools/bugzilla/index.cgi b/webtools/bugzilla/index.cgi index f6e11ac2190..1bdaa5351cb 100755 --- a/webtools/bugzilla/index.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/long_list.cgi b/webtools/bugzilla/long_list.cgi index 5bb19956c70..4c787a34e22 100755 --- a/webtools/bugzilla/long_list.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/move.pl b/webtools/bugzilla/move.pl index ab0794243db..fa34e758de7 100755 --- a/webtools/bugzilla/move.pl +++ b/webtools/bugzilla/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/webtools/bugzilla/page.cgi b/webtools/bugzilla/page.cgi index 960774cc4b8..48fafb38024 100755 --- a/webtools/bugzilla/page.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/post_bug.cgi b/webtools/bugzilla/post_bug.cgi index c319e802431..670920d4324 100755 --- a/webtools/bugzilla/post_bug.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/process_bug.cgi b/webtools/bugzilla/process_bug.cgi index 94c74fcf5f8..9476b7d68eb 100755 --- a/webtools/bugzilla/process_bug.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/query.cgi b/webtools/bugzilla/query.cgi index f6f8c87a5b0..470e3dfbdba 100755 --- a/webtools/bugzilla/query.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/queryhelp.cgi b/webtools/bugzilla/queryhelp.cgi index eb9893bd8b0..175605d9a89 100755 --- a/webtools/bugzilla/queryhelp.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/quips.cgi b/webtools/bugzilla/quips.cgi index 067fa950e30..02109fcdaca 100755 --- a/webtools/bugzilla/quips.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/relogin.cgi b/webtools/bugzilla/relogin.cgi index 493f5c200f4..c0182de491a 100755 --- a/webtools/bugzilla/relogin.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/report.cgi b/webtools/bugzilla/report.cgi index 9978e2002f4..2a081606b0a 100755 --- a/webtools/bugzilla/report.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/reports.cgi b/webtools/bugzilla/reports.cgi index 5c802ccfee4..d3b1d943171 100755 --- a/webtools/bugzilla/reports.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/request.cgi b/webtools/bugzilla/request.cgi index 29c19f27f7f..79091635949 100755 --- a/webtools/bugzilla/request.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/runtests.pl b/webtools/bugzilla/runtests.pl index 376a4a1e471..d5059fdc092 100755 --- a/webtools/bugzilla/runtests.pl +++ b/webtools/bugzilla/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/webtools/bugzilla/runtests.sh b/webtools/bugzilla/runtests.sh index 164ec3acffe..e69de29bb2d 100755 --- a/webtools/bugzilla/runtests.sh +++ b/webtools/bugzilla/runtests.sh @@ -1,10 +0,0 @@ -#!/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} diff --git a/webtools/bugzilla/sanitycheck.cgi b/webtools/bugzilla/sanitycheck.cgi index a28858f433d..16a12396782 100755 --- a/webtools/bugzilla/sanitycheck.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/show_activity.cgi b/webtools/bugzilla/show_activity.cgi index 14b4149ba26..c748c3df762 100755 --- a/webtools/bugzilla/show_activity.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/show_bug.cgi b/webtools/bugzilla/show_bug.cgi index 80e53e61632..c4c05f42cc8 100755 --- a/webtools/bugzilla/show_bug.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/showattachment.cgi b/webtools/bugzilla/showattachment.cgi index 2471332fce3..bfe9ef9888a 100755 --- a/webtools/bugzilla/showattachment.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/showdependencygraph.cgi b/webtools/bugzilla/showdependencygraph.cgi index 77a1d4dc020..fd0a75cb412 100755 --- a/webtools/bugzilla/showdependencygraph.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/showdependencytree.cgi b/webtools/bugzilla/showdependencytree.cgi index 4ee9e4cc83a..9149296b75d 100755 --- a/webtools/bugzilla/showdependencytree.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/sidebar.cgi b/webtools/bugzilla/sidebar.cgi index 7cf823aaaf0..7a054abc2b1 100755 --- a/webtools/bugzilla/sidebar.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/t/002goodperl.t b/webtools/bugzilla/t/002goodperl.t index f6f14adb566..1cfb6a06f25 100644 --- a/webtools/bugzilla/t/002goodperl.t +++ b/webtools/bugzilla/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/webtools/bugzilla/token.cgi b/webtools/bugzilla/token.cgi index 9a7efb5c5a2..5da824bae29 100755 --- a/webtools/bugzilla/token.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/userprefs.cgi b/webtools/bugzilla/userprefs.cgi index 271dbd84710..156c6a2ddf3 100755 --- a/webtools/bugzilla/userprefs.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/votes.cgi b/webtools/bugzilla/votes.cgi index b8fbfa8474a..6b35fc02766 100755 --- a/webtools/bugzilla/votes.cgi +++ b/webtools/bugzilla/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/webtools/bugzilla/whineatnews.pl b/webtools/bugzilla/whineatnews.pl index a0a30205e6d..330cf7cbdba 100755 --- a/webtools/bugzilla/whineatnews.pl +++ b/webtools/bugzilla/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/webtools/bugzilla/xml.cgi b/webtools/bugzilla/xml.cgi index f93c0e5c0ef..103838f8695 100755 --- a/webtools/bugzilla/xml.cgi +++ b/webtools/bugzilla/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