diff options
129 files changed, 228 insertions, 222 deletions
diff --git a/contrib/clear-memcached.pl b/contrib/clear-memcached.pl index 31fe3bb00..58157770a 100755 --- a/contrib/clear-memcached.pl +++ b/contrib/clear-memcached.pl @@ -9,9 +9,7 @@ use strict; use warnings; - -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants; diff --git a/contrib/clear-templates.pl b/contrib/clear-templates.pl index ba89cb6d5..5954e71ad 100755 --- a/contrib/clear-templates.pl +++ b/contrib/clear-templates.pl @@ -9,8 +9,7 @@ use strict; use warnings; -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants; diff --git a/contrib/fixperms.pl b/contrib/fixperms.pl index 3246fc06b..e92a31138 100755 --- a/contrib/fixperms.pl +++ b/contrib/fixperms.pl @@ -21,8 +21,7 @@ use strict; use warnings; -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Install::Filesystem qw(fix_all_file_permissions); diff --git a/contrib/nagios_blocker_checker.pl b/contrib/nagios_blocker_checker.pl index f0d18f509..711f54a1d 100755 --- a/contrib/nagios_blocker_checker.pl +++ b/contrib/nagios_blocker_checker.pl @@ -9,10 +9,7 @@ use strict; use warnings; - -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; - +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants; diff --git a/email_in.pl b/email_in.pl index 0e61bf8f1..f36ddb2a1 100755 --- a/email_in.pl +++ b/email_in.pl @@ -10,13 +10,7 @@ use 5.10.1; use strict; use warnings; -use FindBin; -BEGIN { - require lib; - my ($bin) = $FindBin::Bin =~ /^(.*)$/; - - lib->import("$bin", "$bin/lib", "$bin/local/lib/perl5"); -} +use lib qw(. lib local/lib/perl5); # MTAs may call this script from any directory, but it should always # run from this one so that it can find its modules. diff --git a/extensions/BMO/bin/bug_1022707.pl b/extensions/BMO/bin/bug_1022707.pl index b0a49aa65..b7a11a034 100755 --- a/extensions/BMO/bin/bug_1022707.pl +++ b/extensions/BMO/bin/bug_1022707.pl @@ -10,8 +10,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants qw( USAGE_MODE_CMDLINE ); diff --git a/extensions/BMO/bin/bug_1093952.pl b/extensions/BMO/bin/bug_1093952.pl index a784e63a3..757a663f6 100755 --- a/extensions/BMO/bin/bug_1093952.pl +++ b/extensions/BMO/bin/bug_1093952.pl @@ -9,8 +9,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Component; diff --git a/extensions/BMO/bin/bug_1141452.pl b/extensions/BMO/bin/bug_1141452.pl index d2d260d7b..435ee3b53 100755 --- a/extensions/BMO/bin/bug_1141452.pl +++ b/extensions/BMO/bin/bug_1141452.pl @@ -9,8 +9,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); BEGIN { use Bugzilla; diff --git a/extensions/BMO/bin/migrate-github-pull-requests.pl b/extensions/BMO/bin/migrate-github-pull-requests.pl index 11bf8c55f..bcf0ec85c 100755 --- a/extensions/BMO/bin/migrate-github-pull-requests.pl +++ b/extensions/BMO/bin/migrate-github-pull-requests.pl @@ -10,8 +10,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); use Bugzilla; BEGIN { Bugzilla->extensions() } diff --git a/extensions/MozReview/bin/add-mozreview-children.pl b/extensions/MozReview/bin/add-mozreview-children.pl index f92c2a19b..4835e1c25 100755 --- a/extensions/MozReview/bin/add-mozreview-children.pl +++ b/extensions/MozReview/bin/add-mozreview-children.pl @@ -14,8 +14,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); BEGIN { use Bugzilla; diff --git a/extensions/Push/bin/bugzilla-pushd.pl b/extensions/Push/bin/bugzilla-pushd.pl index 8e92381f3..3faed5f00 100755 --- a/extensions/Push/bin/bugzilla-pushd.pl +++ b/extensions/Push/bin/bugzilla-pushd.pl @@ -10,8 +10,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); BEGIN { use Bugzilla; diff --git a/extensions/Push/bin/nagios_push_checker.pl b/extensions/Push/bin/nagios_push_checker.pl index 092a9da8f..725e699ec 100755 --- a/extensions/Push/bin/nagios_push_checker.pl +++ b/extensions/Push/bin/nagios_push_checker.pl @@ -10,8 +10,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants; diff --git a/extensions/RequestNagger/bin/send-request-nags.pl b/extensions/RequestNagger/bin/send-request-nags.pl index b3c654956..d9da4f04b 100755 --- a/extensions/RequestNagger/bin/send-request-nags.pl +++ b/extensions/RequestNagger/bin/send-request-nags.pl @@ -10,8 +10,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); use Bugzilla; BEGIN { Bugzilla->extensions() } diff --git a/extensions/Review/bin/migrate_mentor_from_whiteboard.pl b/extensions/Review/bin/migrate_mentor_from_whiteboard.pl index ff109a5af..c6b69006f 100755 --- a/extensions/Review/bin/migrate_mentor_from_whiteboard.pl +++ b/extensions/Review/bin/migrate_mentor_from_whiteboard.pl @@ -12,8 +12,7 @@ use strict; use warnings; $| = 1; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); use Bugzilla; BEGIN { Bugzilla->extensions() } diff --git a/extensions/Review/bin/review_requests_rebuild.pl b/extensions/Review/bin/review_requests_rebuild.pl index 6574f3dbe..df9a99774 100755 --- a/extensions/Review/bin/review_requests_rebuild.pl +++ b/extensions/Review/bin/review_requests_rebuild.pl @@ -11,8 +11,7 @@ use strict; use warnings; $| = 1; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); use Bugzilla; BEGIN { Bugzilla->extensions() } diff --git a/extensions/TrackingFlags/bin/bug_825946.pl b/extensions/TrackingFlags/bin/bug_825946.pl index 8f48a671a..20d21aea5 100755 --- a/extensions/TrackingFlags/bin/bug_825946.pl +++ b/extensions/TrackingFlags/bin/bug_825946.pl @@ -9,8 +9,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); BEGIN { use Bugzilla; diff --git a/extensions/TrackingFlags/bin/bulk_flag_clear.pl b/extensions/TrackingFlags/bin/bulk_flag_clear.pl index 6b05a50a3..e599d8e51 100755 --- a/extensions/TrackingFlags/bin/bulk_flag_clear.pl +++ b/extensions/TrackingFlags/bin/bulk_flag_clear.pl @@ -9,8 +9,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); BEGIN { use Bugzilla; diff --git a/extensions/TrackingFlags/bin/migrate_tracking_flags.pl b/extensions/TrackingFlags/bin/migrate_tracking_flags.pl index bca03f9f9..0081462d9 100755 --- a/extensions/TrackingFlags/bin/migrate_tracking_flags.pl +++ b/extensions/TrackingFlags/bin/migrate_tracking_flags.pl @@ -12,8 +12,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); BEGIN { use Bugzilla; diff --git a/extensions/UserProfile/bin/migrate.pl b/extensions/UserProfile/bin/migrate.pl index 2cde3ce2c..3b7057af8 100755 --- a/extensions/UserProfile/bin/migrate.pl +++ b/extensions/UserProfile/bin/migrate.pl @@ -11,8 +11,7 @@ use strict; use warnings; $| = 1; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); use Bugzilla; BEGIN { Bugzilla->extensions() } diff --git a/extensions/UserProfile/bin/update.pl b/extensions/UserProfile/bin/update.pl index af9a81774..8f59646ae 100755 --- a/extensions/UserProfile/bin/update.pl +++ b/extensions/UserProfile/bin/update.pl @@ -10,8 +10,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); use Bugzilla; BEGIN { Bugzilla->extensions() } diff --git a/metrics.pl b/metrics.pl index afcd7d22d..b181ebf32 100755 --- a/metrics.pl +++ b/metrics.pl @@ -10,13 +10,9 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); -BEGIN { - delete $ENV{SERVER_SOFTWARE}; -} - -use FindBin qw($RealBin); -use lib ("$RealBin/.", "$RealBin/lib", "$RealBin/local/lib/perl5"); +BEGIN { delete $ENV{SERVER_SOFTWARE}; } use Bugzilla; use Bugzilla::Constants; diff --git a/qa/t/rest_bugzilla.t b/qa/t/rest_bugzilla.t index cffab80db..01ee6af65 100644 --- a/qa/t/rest_bugzilla.t +++ b/qa/t/rest_bugzilla.t @@ -12,9 +12,7 @@ use 5.10.1; use strict; use warnings; - -use FindBin qw($RealBin); -use lib "$RealBin/lib", "$RealBin/../../lib", "$RealBin/../../local/lib/perl5"; +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More tests => 11; use QA::REST; diff --git a/qa/t/rest_classification.t b/qa/t/rest_classification.t index d3806680a..f5485de2b 100644 --- a/qa/t/rest_classification.t +++ b/qa/t/rest_classification.t @@ -12,9 +12,7 @@ use 5.10.1; use strict; use warnings; - -use FindBin qw($RealBin); -use lib "$RealBin/lib", "$RealBin/../../lib", "$RealBin/../../local/lib/perl5"; +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More tests => 7; use QA::REST; diff --git a/qa/t/test_bmo_autolinkification.t b/qa/t/test_bmo_autolinkification.t index 520301165..af61f09a4 100644 --- a/qa/t/test_bmo_autolinkification.t +++ b/qa/t/test_bmo_autolinkification.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_bmo_enter_new_bug.t b/qa/t/test_bmo_enter_new_bug.t index fde8758d0..702d067a1 100644 --- a/qa/t/test_bmo_enter_new_bug.t +++ b/qa/t/test_bmo_enter_new_bug.t @@ -14,7 +14,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_bmo_retire_values.t b/qa/t/test_bmo_retire_values.t index f6086e0f9..3a74e8966 100644 --- a/qa/t/test_bmo_retire_values.t +++ b/qa/t/test_bmo_retire_values.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_bug_edit.t b/qa/t/test_bug_edit.t index ae72aa127..8e42a139d 100644 --- a/qa/t/test_bug_edit.t +++ b/qa/t/test_bug_edit.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_choose_priority.t b/qa/t/test_choose_priority.t index a35823327..95f401e66 100644 --- a/qa/t/test_choose_priority.t +++ b/qa/t/test_choose_priority.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_classifications.t b/qa/t/test_classifications.t index ec5597d9e..a30e72018 100644 --- a/qa/t/test_classifications.t +++ b/qa/t/test_classifications.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_config.t b/qa/t/test_config.t index e2f82fc21..ef1d8d898 100644 --- a/qa/t/test_config.t +++ b/qa/t/test_config.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_create_user_accounts.t b/qa/t/test_create_user_accounts.t index 5d6471073..050191a19 100644 --- a/qa/t/test_create_user_accounts.t +++ b/qa/t/test_create_user_accounts.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_custom_fields.t b/qa/t/test_custom_fields.t index 7c69e4bbf..fa669b79e 100644 --- a/qa/t/test_custom_fields.t +++ b/qa/t/test_custom_fields.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_custom_fields_admin.t b/qa/t/test_custom_fields_admin.t index cadb6c157..81fcfe7cb 100644 --- a/qa/t/test_custom_fields_admin.t +++ b/qa/t/test_custom_fields_admin.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_default_groups.t b/qa/t/test_default_groups.t index 974898dac..b163e2222 100644 --- a/qa/t/test_default_groups.t +++ b/qa/t/test_default_groups.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_dependencies.t b/qa/t/test_dependencies.t index f842b5fcd..c054a4d08 100644 --- a/qa/t/test_dependencies.t +++ b/qa/t/test_dependencies.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_edit_products_properties.t b/qa/t/test_edit_products_properties.t index 417fa4be6..b62e71061 100644 --- a/qa/t/test_edit_products_properties.t +++ b/qa/t/test_edit_products_properties.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_enter_new_bug.t b/qa/t/test_enter_new_bug.t index b7ac92461..ae527b32a 100644 --- a/qa/t/test_enter_new_bug.t +++ b/qa/t/test_enter_new_bug.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_flags.t b/qa/t/test_flags.t index 0f7c950f7..8b7883bb5 100644 --- a/qa/t/test_flags.t +++ b/qa/t/test_flags.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_flags2.t b/qa/t/test_flags2.t index 9706af639..cec9ee6ef 100644 --- a/qa/t/test_flags2.t +++ b/qa/t/test_flags2.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_groups.t b/qa/t/test_groups.t index caf30fbac..eab30125f 100644 --- a/qa/t/test_groups.t +++ b/qa/t/test_groups.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_keywords.t b/qa/t/test_keywords.t index 5789676b4..72a4f6049 100644 --- a/qa/t/test_keywords.t +++ b/qa/t/test_keywords.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_login.t b/qa/t/test_login.t index 2b66d6e3c..45bf1408f 100644 --- a/qa/t/test_login.t +++ b/qa/t/test_login.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_long_list_redirection.t b/qa/t/test_long_list_redirection.t index 4e3a8ba97..2ee23f9a2 100644 --- a/qa/t/test_long_list_redirection.t +++ b/qa/t/test_long_list_redirection.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; use QA::Util; diff --git a/qa/t/test_milestones.t b/qa/t/test_milestones.t index baf04d402..e55bd5ca4 100644 --- a/qa/t/test_milestones.t +++ b/qa/t/test_milestones.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_password_complexity.t b/qa/t/test_password_complexity.t index 5d358864b..97b440ddd 100644 --- a/qa/t/test_password_complexity.t +++ b/qa/t/test_password_complexity.t @@ -8,9 +8,7 @@ use 5.10.1; use strict; use warnings; - -use FindBin qw($RealBin); -use lib "$RealBin/lib", "$RealBin/../../lib", "$RealBin/../../local/lib/perl5"; +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; use QA::Util; diff --git a/qa/t/test_private_attachments.t b/qa/t/test_private_attachments.t index 74b5adac9..6126974d7 100644 --- a/qa/t/test_private_attachments.t +++ b/qa/t/test_private_attachments.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_qa_contact.t b/qa/t/test_qa_contact.t index 66bcb74ab..b75044806 100644 --- a/qa/t/test_qa_contact.t +++ b/qa/t/test_qa_contact.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_require_login.t b/qa/t/test_require_login.t index e4fd81891..7b39e7329 100644 --- a/qa/t/test_require_login.t +++ b/qa/t/test_require_login.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_sanity_check.t b/qa/t/test_sanity_check.t index 84fc4d8c4..06ab57355 100644 --- a/qa/t/test_sanity_check.t +++ b/qa/t/test_sanity_check.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_saved_searches.t b/qa/t/test_saved_searches.t index b92307e60..b5f47ff4a 100644 --- a/qa/t/test_saved_searches.t +++ b/qa/t/test_saved_searches.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_search.t b/qa/t/test_search.t index b1f77aebf..780708a84 100644 --- a/qa/t/test_search.t +++ b/qa/t/test_search.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use QA::Util; use Test::More "no_plan"; diff --git a/qa/t/test_security.t b/qa/t/test_security.t index 7ff0152be..6d545ffd5 100644 --- a/qa/t/test_security.t +++ b/qa/t/test_security.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_shared_searches.t b/qa/t/test_shared_searches.t index 6b38a271b..edae86dec 100644 --- a/qa/t/test_shared_searches.t +++ b/qa/t/test_shared_searches.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_show_all_products.t b/qa/t/test_show_all_products.t index 97d915174..36f61e42c 100644 --- a/qa/t/test_show_all_products.t +++ b/qa/t/test_show_all_products.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_shutdown.t b/qa/t/test_shutdown.t index be562ad24..33b9b426b 100644 --- a/qa/t/test_shutdown.t +++ b/qa/t/test_shutdown.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_status_whiteboard.t b/qa/t/test_status_whiteboard.t index 6c7f7b085..94582dd54 100644 --- a/qa/t/test_status_whiteboard.t +++ b/qa/t/test_status_whiteboard.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_sudo_sessions.t b/qa/t/test_sudo_sessions.t index fb2b52a40..9ef93c32d 100644 --- a/qa/t/test_sudo_sessions.t +++ b/qa/t/test_sudo_sessions.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_target_milestones.t b/qa/t/test_target_milestones.t index f02eb42d7..6aa211428 100644 --- a/qa/t/test_target_milestones.t +++ b/qa/t/test_target_milestones.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_time_summary.t b/qa/t/test_time_summary.t index 0ae2ea5da..504c864f2 100644 --- a/qa/t/test_time_summary.t +++ b/qa/t/test_time_summary.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_user_groups.t b/qa/t/test_user_groups.t index 654f8dad6..89fc2fd6d 100644 --- a/qa/t/test_user_groups.t +++ b/qa/t/test_user_groups.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_user_matching.t b/qa/t/test_user_matching.t index 0326b8770..3b7b71ed5 100644 --- a/qa/t/test_user_matching.t +++ b/qa/t/test_user_matching.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_user_preferences.t b/qa/t/test_user_preferences.t index ec5fa8187..d9e0562c1 100644 --- a/qa/t/test_user_preferences.t +++ b/qa/t/test_user_preferences.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_user_privs.t b/qa/t/test_user_privs.t index 367049bc7..72b205b25 100644 --- a/qa/t/test_user_privs.t +++ b/qa/t/test_user_privs.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/test_votes.t b/qa/t/test_votes.t index b36491b60..ee257e85c 100644 --- a/qa/t/test_votes.t +++ b/qa/t/test_votes.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More "no_plan"; diff --git a/qa/t/webservice_bug_add_attachment.t b/qa/t/webservice_bug_add_attachment.t index 1ea0ca76a..e2dad94c3 100644 --- a/qa/t/webservice_bug_add_attachment.t +++ b/qa/t/webservice_bug_add_attachment.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use QA::Util; use MIME::Base64 qw(encode_base64 decode_base64); use Test::More tests => 187; diff --git a/qa/t/webservice_bug_add_comment.t b/qa/t/webservice_bug_add_comment.t index 64c410f3f..cf0310602 100644 --- a/qa/t/webservice_bug_add_comment.t +++ b/qa/t/webservice_bug_add_comment.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use QA::Util; use Test::More tests => 141; my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients(); diff --git a/qa/t/webservice_bug_attachments.t b/qa/t/webservice_bug_attachments.t index da63ddd27..daa5032a3 100644 --- a/qa/t/webservice_bug_attachments.t +++ b/qa/t/webservice_bug_attachments.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use QA::Util; use QA::Tests qw(STANDARD_BUG_TESTS PRIVATE_BUG_USER); use Data::Dumper; diff --git a/qa/t/webservice_bug_comments.t b/qa/t/webservice_bug_comments.t index df583c8ce..ccc0c6d34 100644 --- a/qa/t/webservice_bug_comments.t +++ b/qa/t/webservice_bug_comments.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use DateTime; use QA::Util; use QA::Tests qw(STANDARD_BUG_TESTS PRIVATE_BUG_USER); diff --git a/qa/t/webservice_bug_create.t b/qa/t/webservice_bug_create.t index 640a714be..8bab088af 100644 --- a/qa/t/webservice_bug_create.t +++ b/qa/t/webservice_bug_create.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Storable qw(dclone); use Test::More tests => 293; use QA::Util; diff --git a/qa/t/webservice_bug_fields.t b/qa/t/webservice_bug_fields.t index d72b25170..be565521f 100644 --- a/qa/t/webservice_bug_fields.t +++ b/qa/t/webservice_bug_fields.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Data::Dumper; use Test::More; use List::Util qw(first); diff --git a/qa/t/webservice_bug_get.t b/qa/t/webservice_bug_get.t index a68f92899..88cc42989 100644 --- a/qa/t/webservice_bug_get.t +++ b/qa/t/webservice_bug_get.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Data::Dumper; use DateTime; use QA::Util; diff --git a/qa/t/webservice_bug_get_bugs.t b/qa/t/webservice_bug_get_bugs.t index d83861350..d66249b2c 100644 --- a/qa/t/webservice_bug_get_bugs.t +++ b/qa/t/webservice_bug_get_bugs.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Data::Dumper; use DateTime; use QA::Util; diff --git a/qa/t/webservice_bug_history.t b/qa/t/webservice_bug_history.t index 3153834fa..7451fe450 100644 --- a/qa/t/webservice_bug_history.t +++ b/qa/t/webservice_bug_history.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use QA::Util; use QA::Tests qw(STANDARD_BUG_TESTS); use Test::More tests => 114; diff --git a/qa/t/webservice_bug_legal_values.t b/qa/t/webservice_bug_legal_values.t index 8e1b039a3..29f444708 100644 --- a/qa/t/webservice_bug_legal_values.t +++ b/qa/t/webservice_bug_legal_values.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More tests => 269; use QA::Util; my ($config, @clients) = get_rpc_clients(); diff --git a/qa/t/webservice_bug_search.t b/qa/t/webservice_bug_search.t index 0a4dcd666..6a4933c5a 100644 --- a/qa/t/webservice_bug_search.t +++ b/qa/t/webservice_bug_search.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use QA::Util; use QA::Tests qw(PRIVATE_BUG_USER); use DateTime; diff --git a/qa/t/webservice_bug_update.t b/qa/t/webservice_bug_update.t index 8ca59cfa7..097c506b6 100644 --- a/qa/t/webservice_bug_update.t +++ b/qa/t/webservice_bug_update.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Data::Dumper; use QA::Util; use QA::Tests qw(PRIVATE_BUG_USER STANDARD_BUG_TESTS); diff --git a/qa/t/webservice_bug_update_see_also.t b/qa/t/webservice_bug_update_see_also.t index 3bdc3dc25..fc6c9bc9e 100644 --- a/qa/t/webservice_bug_update_see_also.t +++ b/qa/t/webservice_bug_update_see_also.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use QA::Util; use QA::Tests qw(PRIVATE_BUG_USER STANDARD_BUG_TESTS); use Test::More tests => 117; diff --git a/qa/t/webservice_bugzilla.t b/qa/t/webservice_bugzilla.t index fef57cca1..6d40e3088 100644 --- a/qa/t/webservice_bugzilla.t +++ b/qa/t/webservice_bugzilla.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More tests => 11 * 3; use QA::Util; my ($config, @clients) = get_rpc_clients(); diff --git a/qa/t/webservice_group_create.t b/qa/t/webservice_group_create.t index 346800b0e..9ddf43d86 100644 --- a/qa/t/webservice_group_create.t +++ b/qa/t/webservice_group_create.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More tests => 77; use QA::Util; diff --git a/qa/t/webservice_jsonp.t b/qa/t/webservice_jsonp.t index dd62b6392..53b23aaf2 100644 --- a/qa/t/webservice_jsonp.t +++ b/qa/t/webservice_jsonp.t @@ -7,7 +7,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More tests => 85; use QA::Util; my $jsonrpc_get = QA::Util::get_jsonrpc_client('GET'); diff --git a/qa/t/webservice_product.t b/qa/t/webservice_product.t index 7f993899f..1ced65276 100644 --- a/qa/t/webservice_product.t +++ b/qa/t/webservice_product.t @@ -15,7 +15,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More tests => 134; use QA::Util; my ($config, @clients) = get_rpc_clients(); diff --git a/qa/t/webservice_product_create.t b/qa/t/webservice_product_create.t index 05b82d60c..3b8fe78b1 100644 --- a/qa/t/webservice_product_create.t +++ b/qa/t/webservice_product_create.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More tests => 121; use QA::Util; diff --git a/qa/t/webservice_product_get.t b/qa/t/webservice_product_get.t index 0128f3348..7f445ced7 100644 --- a/qa/t/webservice_product_get.t +++ b/qa/t/webservice_product_get.t @@ -15,7 +15,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Test::More tests => 134; use QA::Util; my ($config, @clients) = get_rpc_clients(); diff --git a/qa/t/webservice_user_create.t b/qa/t/webservice_user_create.t index 551de9977..f82e71ae4 100644 --- a/qa/t/webservice_user_create.t +++ b/qa/t/webservice_user_create.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use QA::Util; use Test::More tests => 75; my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients(); diff --git a/qa/t/webservice_user_get.t b/qa/t/webservice_user_get.t index 7d50bf22e..4a7f74f78 100644 --- a/qa/t/webservice_user_get.t +++ b/qa/t/webservice_user_get.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use QA::Util; use QA::Tests qw(PRIVATE_BUG_USER); use Test::More tests => 330; diff --git a/qa/t/webservice_user_login_logout.t b/qa/t/webservice_user_login_logout.t index 2affb961c..a6abec88e 100644 --- a/qa/t/webservice_user_login_logout.t +++ b/qa/t/webservice_user_login_logout.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use Data::Dumper; use QA::Util; use Test::More tests => 119; diff --git a/qa/t/webservice_user_offer_account_by_email.t b/qa/t/webservice_user_offer_account_by_email.t index ae311afb8..e9392bab5 100644 --- a/qa/t/webservice_user_offer_account_by_email.t +++ b/qa/t/webservice_user_offer_account_by_email.t @@ -11,7 +11,7 @@ use strict; use warnings; -use lib qw(lib); +use lib qw(lib ../../lib ../../local/lib/perl5); use QA::Util; use Test::More tests => 29; my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients(); diff --git a/scripts/1298978.pl b/scripts/1298978.pl index c4ae39f07..9320e080e 100755 --- a/scripts/1298978.pl +++ b/scripts/1298978.pl @@ -9,9 +9,8 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin '$RealBin'; -use lib "$RealBin/../..", "$RealBin/../../lib"; use Bugzilla; use Bugzilla::Bug; diff --git a/scripts/addcustomfield.pl b/scripts/addcustomfield.pl index 6e128ab6f..a9bd2bcb3 100755 --- a/scripts/addcustomfield.pl +++ b/scripts/addcustomfield.pl @@ -16,9 +16,11 @@ # Contributor(s): Frédéric Buclin <LpSolit@gmail.com> # David Miller <justdave@mozilla.com> +use 5.10.1; use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use warnings; +use lib qw(. lib local/lib/perl5); + use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/clear-memcached.pl b/scripts/clear-memcached.pl index 0ce97e7a0..bbf8f1cca 100755 --- a/scripts/clear-memcached.pl +++ b/scripts/clear-memcached.pl @@ -9,9 +9,10 @@ use strict; use warnings; +use lib qw(. lib local/lib/perl5); + + -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/clear-templates.pl b/scripts/clear-templates.pl index 81c85646b..9deb2e47d 100755 --- a/scripts/clear-templates.pl +++ b/scripts/clear-templates.pl @@ -9,8 +9,9 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); + + use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/close_bugs_wontfix.pl b/scripts/close_bugs_wontfix.pl index e0bd5351b..1c80a965d 100755 --- a/scripts/close_bugs_wontfix.pl +++ b/scripts/close_bugs_wontfix.pl @@ -9,9 +9,8 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; use Bugzilla; use Bugzilla::Bug; diff --git a/scripts/convert_datetime.pl b/scripts/convert_datetime.pl index b6b71546c..279eb84b8 100755 --- a/scripts/convert_datetime.pl +++ b/scripts/convert_datetime.pl @@ -9,9 +9,10 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); + + -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/cpanfile_fixed_versions.pl b/scripts/cpanfile_fixed_versions.pl index 680e8ece3..dd2fc0a0c 100755 --- a/scripts/cpanfile_fixed_versions.pl +++ b/scripts/cpanfile_fixed_versions.pl @@ -9,9 +9,10 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); + + -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; use Bugzilla::Constants; use Bugzilla::Install::Requirements; diff --git a/scripts/eject-users-from-groups.pl b/scripts/eject-users-from-groups.pl index c67238705..52e2bbbf3 100644 --- a/scripts/eject-users-from-groups.pl +++ b/scripts/eject-users-from-groups.pl @@ -8,9 +8,10 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); + + -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; use Getopt::Long; use Bugzilla; diff --git a/scripts/fix-attachment-sizes.pl b/scripts/fix-attachment-sizes.pl index 328c0595e..6c5a3a39c 100755 --- a/scripts/fix-attachment-sizes.pl +++ b/scripts/fix-attachment-sizes.pl @@ -7,11 +7,11 @@ # This Source Code Form is "Incompatible With Secondary Licenses", as # defined by the Mozilla Public License, v. 2.0. +use 5.10.1; use strict; -use feature 'say'; +use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/fix_all_open_status_queries.pl b/scripts/fix_all_open_status_queries.pl index da40cb140..1ba7c66c6 100755 --- a/scripts/fix_all_open_status_queries.pl +++ b/scripts/fix_all_open_status_queries.pl @@ -6,10 +6,11 @@ # This Source Code Form is "Incompatible With Secondary Licenses", as # defined by the Mozilla Public License, v. 2.0. +use 5.10.1; use strict; +use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/fixgroupqueries.pl b/scripts/fixgroupqueries.pl index 1934561df..23d86268d 100755 --- a/scripts/fixgroupqueries.pl +++ b/scripts/fixgroupqueries.pl @@ -20,10 +20,10 @@ # # Contributor(s): Gervase Markham <gerv@gerv.net> +use 5.10.1; use strict; - -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use warnings; +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/fixperms.pl b/scripts/fixperms.pl index f470eabe6..43b11af08 100755 --- a/scripts/fixperms.pl +++ b/scripts/fixperms.pl @@ -21,8 +21,9 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); + + use Bugzilla; use Bugzilla::Install::Filesystem qw(fix_all_file_permissions); diff --git a/scripts/fixqueries.pl b/scripts/fixqueries.pl index 2619081ce..c26165160 100755 --- a/scripts/fixqueries.pl +++ b/scripts/fixqueries.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # -*- Mode: perl; indent-tabs-mode: nil -*- # # The contents of this file are subject to the Mozilla Public @@ -20,10 +20,10 @@ # # Contributor(s): Gervase Markham <gerv@gerv.net> +use 5.10.1; use strict; - -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use warnings; +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/generate_bmo_data.pl b/scripts/generate_bmo_data.pl index 541dc8053..485ad5398 100755 --- a/scripts/generate_bmo_data.pl +++ b/scripts/generate_bmo_data.pl @@ -5,8 +5,9 @@ use strict; use warnings; +use lib qw(. lib local/lib/perl5); + -use lib qw(. local/lib/perl5); use Bugzilla; use Bugzilla::User; diff --git a/scripts/group-set-members.pl b/scripts/group-set-members.pl index 10955b00d..0ec9aedda 100755 --- a/scripts/group-set-members.pl +++ b/scripts/group-set-members.pl @@ -9,10 +9,9 @@ use strict; use warnings; +use lib qw(. lib local/lib/perl5); use feature 'say'; -use FindBin; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); + use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/issue-api-key.pl b/scripts/issue-api-key.pl index 3e4b2c000..810b7e17e 100755 --- a/scripts/issue-api-key.pl +++ b/scripts/issue-api-key.pl @@ -7,11 +7,10 @@ # This Source Code Form is "Incompatible With Secondary Licenses", as # defined by the Mozilla Public License, v. 2.0. +use 5.10.1; use strict; -use feature 'say'; - -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use warnings; +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/merge-users.pl b/scripts/merge-users.pl index d2b8196b5..2d9c795d7 100755 --- a/scripts/merge-users.pl +++ b/scripts/merge-users.pl @@ -9,6 +9,7 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); =head1 NAME @@ -31,7 +32,7 @@ merge-users.pl - Merge two user accounts. =cut -use lib qw(. lib local/lib/perl5); + use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/migrate-attachments.pl b/scripts/migrate-attachments.pl index b514f1620..dee1e7a3b 100755 --- a/scripts/migrate-attachments.pl +++ b/scripts/migrate-attachments.pl @@ -9,10 +9,11 @@ use strict; use warnings; +use lib qw(. lib local/lib/perl5); $| = 1; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); + + use Bugzilla; use Bugzilla::Attachment; diff --git a/scripts/migrate-cab-review.pl b/scripts/migrate-cab-review.pl index aa30c518f..b4665f255 100755 --- a/scripts/migrate-cab-review.pl +++ b/scripts/migrate-cab-review.pl @@ -9,9 +9,10 @@ use strict; use warnings; +use lib qw(. lib local/lib/perl5); + + -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Bug; diff --git a/scripts/migrate_whiteboard_keyword.pl b/scripts/migrate_whiteboard_keyword.pl index f31a30521..a1bbf6152 100644 --- a/scripts/migrate_whiteboard_keyword.pl +++ b/scripts/migrate_whiteboard_keyword.pl @@ -31,9 +31,8 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/move_flag_types.pl b/scripts/move_flag_types.pl index bf0bf0eca..d4aa6cb09 100755 --- a/scripts/move_flag_types.pl +++ b/scripts/move_flag_types.pl @@ -81,9 +81,7 @@ Without this argument, changes are not actually committed to the database. use strict; use warnings; - -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(. lib local/lib/perl5); use Bugzilla; use Getopt::Long; diff --git a/scripts/move_os.pl b/scripts/move_os.pl index 48f6d0031..546b47c7e 100755 --- a/scripts/move_os.pl +++ b/scripts/move_os.pl @@ -9,9 +9,10 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); + + -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Field; diff --git a/scripts/movebugs.pl b/scripts/movebugs.pl index 45f329ad2..2c643cdfb 100755 --- a/scripts/movebugs.pl +++ b/scripts/movebugs.pl @@ -8,12 +8,12 @@ # defined by the Mozilla Public License, v. 2.0. use strict; +use warnings; +use lib qw(. lib local/lib/perl5); + use Cwd 'abs_path'; use File::Basename; -use FindBin; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/movecomponent.pl b/scripts/movecomponent.pl index 10fa956c4..c558808fc 100755 --- a/scripts/movecomponent.pl +++ b/scripts/movecomponent.pl @@ -6,10 +6,10 @@ # This Source Code Form is "Incompatible With Secondary Licenses", as # defined by the Mozilla Public License, v. 2.0. +use 5.10.1; use strict; - -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use warnings; +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Component; diff --git a/scripts/nagios_blocker_checker.pl b/scripts/nagios_blocker_checker.pl index a6c5e5d7b..27947f03d 100755 --- a/scripts/nagios_blocker_checker.pl +++ b/scripts/nagios_blocker_checker.pl @@ -9,9 +9,8 @@ use strict; use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/nagios_push_checker.pl b/scripts/nagios_push_checker.pl index 1fa28bf1d..ef350c3e1 100755 --- a/scripts/nagios_push_checker.pl +++ b/scripts/nagios_push_checker.pl @@ -9,9 +9,10 @@ use strict; use warnings; +use lib qw(. lib local/lib/perl5); + + -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/nuke-bugs.pl b/scripts/nuke-bugs.pl index 35774ff8d..6faf7d694 100755 --- a/scripts/nuke-bugs.pl +++ b/scripts/nuke-bugs.pl @@ -6,10 +6,11 @@ # This Source Code Form is "Incompatible With Secondary Licenses", as # defined by the Mozilla Public License, v. 2.0. +use 5.10.1; use strict; +use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/reassign_open_bugs.pl b/scripts/reassign_open_bugs.pl index 343a99617..d0f107c16 100755 --- a/scripts/reassign_open_bugs.pl +++ b/scripts/reassign_open_bugs.pl @@ -9,9 +9,10 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); + + -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::User; diff --git a/scripts/remove-non-public-data.pl b/scripts/remove-non-public-data.pl index 8b5d2b2e7..fd379af79 100755 --- a/scripts/remove-non-public-data.pl +++ b/scripts/remove-non-public-data.pl @@ -6,10 +6,10 @@ # This Source Code Form is "Incompatible With Secondary Licenses", as # defined by the Mozilla Public License, v. 2.0. +use 5.10.1; use strict; - -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use warnings; +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/remove_idle_group_members.pl b/scripts/remove_idle_group_members.pl index 510d0623b..407a8e6dc 100755 --- a/scripts/remove_idle_group_members.pl +++ b/scripts/remove_idle_group_members.pl @@ -9,9 +9,8 @@ use strict; use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; BEGIN { Bugzilla->extensions() } diff --git a/scripts/reset_default_user.pl b/scripts/reset_default_user.pl index 2888df48c..d0d2534f2 100755 --- a/scripts/reset_default_user.pl +++ b/scripts/reset_default_user.pl @@ -6,10 +6,10 @@ # This Source Code Form is "Incompatible With Secondary Licenses", as # defined by the Mozilla Public License, v. 2.0. +use 5.10.1; use strict; - -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use warnings; +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/sanitizeme.pl b/scripts/sanitizeme.pl index 8f241de34..0fc2d74d9 100755 --- a/scripts/sanitizeme.pl +++ b/scripts/sanitizeme.pl @@ -23,9 +23,9 @@ # Byron Jones <glob@mozilla.com> use strict; +use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Bug; diff --git a/scripts/security_remove.pl b/scripts/security_remove.pl index 7c01e8002..dc0847e3c 100755 --- a/scripts/security_remove.pl +++ b/scripts/security_remove.pl @@ -9,9 +9,10 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); + + -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/sendunsentbugmail.pl b/scripts/sendunsentbugmail.pl index 3dae4a341..a8e1ed4dc 100755 --- a/scripts/sendunsentbugmail.pl +++ b/scripts/sendunsentbugmail.pl @@ -9,9 +9,10 @@ use 5.10.1; use strict; use warnings; - use lib qw(. lib local/lib/perl5); + + use Bugzilla; use Bugzilla::Constants; use Bugzilla::BugMail; diff --git a/scripts/syncflags.pl b/scripts/syncflags.pl index 7250cdf89..e6b521e62 100755 --- a/scripts/syncflags.pl +++ b/scripts/syncflags.pl @@ -22,10 +22,11 @@ # See also https://bugzilla.mozilla.org/show_bug.cgi?id=119569 +use 5.10.1; use strict; +use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/syncmsandversions.pl b/scripts/syncmsandversions.pl index e886d9e5b..509a78cc8 100755 --- a/scripts/syncmsandversions.pl +++ b/scripts/syncmsandversions.pl @@ -23,9 +23,9 @@ # See also https://bugzilla.mozilla.org/show_bug.cgi?id=119569 use strict; +use warnings; +use lib qw(. lib local/lib/perl5); -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/test b/scripts/test new file mode 100644 index 000000000..64e7ee9b9 --- /dev/null +++ b/scripts/test @@ -0,0 +1,35 @@ +find . \ + -not -name security_remove.pl \ + -not -name close_bugs_wontfix.pl \ + -not -name fix-attachment-sizes.pl \ + -not -name sanitizeme.pl \ + -not -name nuke-bugs.pl \ + -not -name fix_all_open_status_queries.pl \ + -not -name addcustomfield.pl \ + -not -name merge-users.pl \ + -not -name migrate_whiteboard_keyword.pl \ + -not -name syncflags.pl \ + -not -name nagios_blocker_checker.pl \ + -not -name 1298978.pl \ + -not -name group-set-members.pl \ + -not -name update-bug-groups.pl \ + -not -name sendunsentbugmail.pl \ + -not -name remove_idle_group_members.pl \ + -not -name movebugs.pl \ + -not -name syncmsandversions.pl \ + -not -name move_flag_types.pl \ + -not -name migrate-cab-review.pl \ + -not -name migrate-attachments.pl \ + -not -name triage_owners_csv.pl \ + -not -name move_os.pl \ + -not -name reassign_open_bugs.pl \ + -not -name generate_bmo_data.pl \ + -not -name user-prefs.pl \ + -not -name clear-templates.pl \ + -not -name fixperms.pl \ + -not -name nagios_push_checker.pl \ + -not -name clear-memcached.pl \ + -not -name eject-users-from-groups.pl \ + -not -name cpanfile_fixed_versions.pl \ + -not -name convert_datetime.pl \ + -not -name update-crash-signatures.pl diff --git a/scripts/triage_owners_csv.pl b/scripts/triage_owners_csv.pl index 214b7b04f..e3feeee0f 100644 --- a/scripts/triage_owners_csv.pl +++ b/scripts/triage_owners_csv.pl @@ -9,9 +9,10 @@ use 5.10.1; use strict; use warnings; +use lib qw(. lib local/lib/perl5); + + -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; use Bugzilla; use Bugzilla::Component; diff --git a/scripts/update-bug-groups.pl b/scripts/update-bug-groups.pl index 0aed32e9b..ef82f0ad6 100755 --- a/scripts/update-bug-groups.pl +++ b/scripts/update-bug-groups.pl @@ -9,10 +9,10 @@ use strict; use warnings; -$| = 1; +use lib qw(. lib local/lib/perl5); + -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +$| = 1; use Bugzilla; use Bugzilla::CGI; diff --git a/scripts/update-crash-signatures.pl b/scripts/update-crash-signatures.pl index f8efca7ff..292427955 100755 --- a/scripts/update-crash-signatures.pl +++ b/scripts/update-crash-signatures.pl @@ -9,10 +9,11 @@ use strict; use warnings; +use lib qw(. lib local/lib/perl5); $| = 1; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); + + use constant BATCH_SIZE => 100; diff --git a/scripts/user-prefs.pl b/scripts/user-prefs.pl index b7c860f48..dc44c5aea 100755 --- a/scripts/user-prefs.pl +++ b/scripts/user-prefs.pl @@ -7,11 +7,10 @@ # This Source Code Form is "Incompatible With Secondary Licenses", as # defined by the Mozilla Public License, v. 2.0. -use strict; use 5.10.1; - -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use strict; +use warnings; +use lib qw(. lib local/lib/perl5); use Bugzilla; use Bugzilla::Constants; @@ -16,10 +16,7 @@ use 5.10.1; use strict; use warnings; - -# exit early if there's nothing to send -use FindBin qw($RealBin); -use lib ("$RealBin/.", "$RealBin/lib", "$RealBin/local/lib/perl5"); +use lib qw(. lib local/lib/perl5); BEGIN { delete $ENV{SERVER_SOFTWARE}; |