From: jake%bugzilla.org <> Date: Thu, 27 Mar 2003 08:06:37 +0000 (+0000) Subject: Bug 196433 - Bugzilla now uses /usr/bin/perl as the shebang line X-Git-Tag: bugzilla-2.17.4~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9665c0e6a0ee98cdd113e11b86d3efab474464c0;p=thirdparty%2Fbugzilla.git 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 b01d982694..9d0da5e246 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 81037a7237..01201a1924 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 33a32f824b..ff12dba354 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 a8ea7b1e1e..7a7548c019 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 22ff8c5629..5e28a46229 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 bdc027a689..5d72827b24 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 30945a5ff5..a70e2250a3 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 0550f42b90..dec8e716c7 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 a1a6f0049c..ec46b3d9de 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 07f08d09b8..0ff538b63a 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 7a245a470c..d9d1aa7b63 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 df80794cda..d0f78b75a5 100644 --- a/docs/sgml/faq.sgml +++ b/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/docs/sgml/installation.sgml b/docs/sgml/installation.sgml index d1fa2401b7..9f94feb7a9 100644 --- a/docs/sgml/installation.sgml +++ b/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/docs/xml/faq.xml b/docs/xml/faq.xml index df80794cda..d0f78b75a5 100644 --- a/docs/xml/faq.xml +++ b/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/docs/xml/installation.xml b/docs/xml/installation.xml index d1fa2401b7..9f94feb7a9 100644 --- a/docs/xml/installation.xml +++ b/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/doeditparams.cgi b/doeditparams.cgi index d37e8b2074..48c39bc7ab 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 175fb649a7..a9a3031f37 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 4ee147453f..35c6426b2c 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 6a23012518..d7794ff936 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 1b793c6d35..ca653b77a8 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 ed298ef9bb..4d11a4aaea 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 e9d5d77e58..4bcf8b19b0 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 372eb4d7be..89099823f0 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 a34812c8dd..9592c02ad8 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 fee00a4e08..4e423c2d54 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 5f420af437..f3e828d985 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 894de886f8..9784b81a3f 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 50139ba40b..7979dfcf90 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 f6e11ac219..1bdaa5351c 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 5bb19956c7..4c787a34e2 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 ab0794243d..fa34e758de 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 960774cc4b..48fafb3802 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 c319e80243..670920d432 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 94c74fcf5f..9476b7d68e 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 f6f8c87a5b..470e3dfbdb 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 eb9893bd8b..175605d9a8 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 067fa950e3..02109fcdac 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 493f5c200f..c0182de491 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 9978e2002f..2a081606b0 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 5c802ccfee..d3b1d94317 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 29c19f27f7..7909163594 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 376a4a1e47..d5059fdc09 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 164ec3acff..d6f3d1a54f 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 a28858f433..16a1239678 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 14b4149ba2..c748c3df76 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 80e53e6163..c4c05f42cc 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 2471332fce..bfe9ef9888 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 77a1d4dc02..fd0a75cb41 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 4ee9e4cc83..9149296b75 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 7cf823aaaf..7a054abc2b 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 f6f14adb56..1cfb6a06f2 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 9a7efb5c5a..5da824bae2 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 271dbd8471..156c6a2ddf 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 b8fbfa8474..6b35fc0276 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 a0a30205e6..330cf7cbdb 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 f93c0e5c0e..103838f869 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