diff options
Diffstat (limited to 'scripts')
37 files changed, 94 insertions, 86 deletions
diff --git a/scripts/addcustomfield.pl b/scripts/addcustomfield.pl index 6e128ab6f..886d1ac5c 100755 --- a/scripts/addcustomfield.pl +++ b/scripts/addcustomfield.pl @@ -17,8 +17,7 @@ # David Miller <justdave@mozilla.com> use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(. lib); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/clear-memcached.pl b/scripts/clear-memcached.pl index 0ce97e7a0..01202ce7c 100755 --- a/scripts/clear-memcached.pl +++ b/scripts/clear-memcached.pl @@ -10,8 +10,9 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin qw($Bin); +use lib "$Bin/.."; +use lib "$Bin/../lib"; use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/clear-templates.pl b/scripts/clear-templates.pl index 81c85646b..8b0864d46 100755 --- a/scripts/clear-templates.pl +++ b/scripts/clear-templates.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); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/close_bugs_wontfix.pl b/scripts/close_bugs_wontfix.pl index e0bd5351b..34c871373 100755 --- a/scripts/close_bugs_wontfix.pl +++ b/scripts/close_bugs_wontfix.pl @@ -10,8 +10,8 @@ use 5.10.1; use strict; use warnings; -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; +use FindBin '$RealBin'; +use lib "$RealBin/../..", "$RealBin/../../lib"; use Bugzilla; use Bugzilla::Bug; diff --git a/scripts/convert_datetime.pl b/scripts/convert_datetime.pl index b6b71546c..b87e3561a 100755 --- a/scripts/convert_datetime.pl +++ b/scripts/convert_datetime.pl @@ -10,9 +10,6 @@ use 5.10.1; use strict; use warnings; -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; - use Bugzilla; use Bugzilla::Constants; use Bugzilla::DB; diff --git a/scripts/cpanfile_fixed_versions.pl b/scripts/cpanfile_fixed_versions.pl index 680e8ece3..fdbf25b1f 100755 --- a/scripts/cpanfile_fixed_versions.pl +++ b/scripts/cpanfile_fixed_versions.pl @@ -10,9 +10,6 @@ use 5.10.1; use strict; use warnings; -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; - use Bugzilla::Constants; use Bugzilla::Install::Requirements; use Bugzilla::Install::Util; diff --git a/scripts/fix-attachment-sizes.pl b/scripts/fix-attachment-sizes.pl index 328c0595e..a50e241ce 100755 --- a/scripts/fix-attachment-sizes.pl +++ b/scripts/fix-attachment-sizes.pl @@ -10,8 +10,9 @@ use strict; use feature 'say'; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin qw( $RealBin ); +use lib "$RealBin/.."; +use lib "$RealBin/../lib"; 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..e10fdd44d 100755 --- a/scripts/fix_all_open_status_queries.pl +++ b/scripts/fix_all_open_status_queries.pl @@ -8,8 +8,7 @@ use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(. lib); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/fixgroupqueries.pl b/scripts/fixgroupqueries.pl index 1934561df..13dd0cb3e 100755 --- a/scripts/fixgroupqueries.pl +++ b/scripts/fixgroupqueries.pl @@ -22,8 +22,7 @@ use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(. lib); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/fixperms.pl b/scripts/fixperms.pl index f470eabe6..406c149cb 100755 --- a/scripts/fixperms.pl +++ b/scripts/fixperms.pl @@ -21,8 +21,7 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(. lib); use Bugzilla; use Bugzilla::Install::Filesystem qw(fix_all_file_permissions); diff --git a/scripts/fixqueries.pl b/scripts/fixqueries.pl index 2619081ce..1fe25f261 100755 --- a/scripts/fixqueries.pl +++ b/scripts/fixqueries.pl @@ -22,8 +22,7 @@ use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(. lib); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/group-set-members.pl b/scripts/group-set-members.pl index 10955b00d..3271b2e24 100755 --- a/scripts/group-set-members.pl +++ b/scripts/group-set-members.pl @@ -11,8 +11,8 @@ use strict; use warnings; use feature 'say'; use FindBin; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib "$FindBin::Bin/../.."; +use lib "$FindBin::Bin/../../lib"; use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/issue-api-key.pl b/scripts/issue-api-key.pl index 3e4b2c000..334cddeaa 100755 --- a/scripts/issue-api-key.pl +++ b/scripts/issue-api-key.pl @@ -10,8 +10,9 @@ use strict; use feature 'say'; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin qw( $RealBin ); +use lib "$RealBin/.."; +use lib "$RealBin/../lib"; use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/merge-users.pl b/scripts/merge-users.pl index d2b8196b5..ebe68a6a8 100755 --- a/scripts/merge-users.pl +++ b/scripts/merge-users.pl @@ -1,14 +1,27 @@ -#!/usr/bin/perl -T -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. +#!/usr/bin/perl -wT +# -*- Mode: perl; indent-tabs-mode: nil -*- # -# This Source Code Form is "Incompatible With Secondary Licenses", as -# defined by the Mozilla Public License, v. 2.0. +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Myk Melez <myk@mozilla.org> +# Frédéric Buclin <LpSolit@gmail.com> -use 5.10.1; use strict; -use warnings; =head1 NAME @@ -31,7 +44,7 @@ merge-users.pl - Merge two user accounts. =cut -use lib qw(. lib local/lib/perl5); +use lib qw(. lib); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/migrate-attachments.pl b/scripts/migrate-attachments.pl index b514f1620..26cb3fb26 100755 --- a/scripts/migrate-attachments.pl +++ b/scripts/migrate-attachments.pl @@ -12,7 +12,7 @@ use warnings; $| = 1; use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib "$RealBin/..", "$RealBin/../lib"; use Bugzilla; use Bugzilla::Attachment; diff --git a/scripts/migrate-cab-review.pl b/scripts/migrate-cab-review.pl index aa30c518f..1c33a2a0f 100755 --- a/scripts/migrate-cab-review.pl +++ b/scripts/migrate-cab-review.pl @@ -11,7 +11,7 @@ use strict; use warnings; use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib "$RealBin/.."; use Bugzilla; use Bugzilla::Bug; diff --git a/scripts/migrate_whiteboard_keyword.pl b/scripts/migrate_whiteboard_keyword.pl index f31a30521..aa70543c4 100644 --- a/scripts/migrate_whiteboard_keyword.pl +++ b/scripts/migrate_whiteboard_keyword.pl @@ -32,8 +32,7 @@ use 5.10.1; use strict; use warnings; -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; +use lib qw(. lib); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/move_flag_types.pl b/scripts/move_flag_types.pl index bf0bf0eca..1f4398be1 100755 --- a/scripts/move_flag_types.pl +++ b/scripts/move_flag_types.pl @@ -82,8 +82,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 '.'; use Bugzilla; use Getopt::Long; diff --git a/scripts/move_os.pl b/scripts/move_os.pl index 48f6d0031..96b58d616 100755 --- a/scripts/move_os.pl +++ b/scripts/move_os.pl @@ -10,8 +10,8 @@ use 5.10.1; use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin '$RealBin'; +use lib "$RealBin/../..", "$RealBin/../../lib"; use Bugzilla; use Bugzilla::Field; diff --git a/scripts/movebugs.pl b/scripts/movebugs.pl index 45f329ad2..ebe41ceb4 100755 --- a/scripts/movebugs.pl +++ b/scripts/movebugs.pl @@ -12,8 +12,8 @@ use strict; use Cwd 'abs_path'; use File::Basename; use FindBin; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib "$FindBin::Bin/../.."; +use lib "$FindBin::Bin/../../lib"; use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/movecomponent.pl b/scripts/movecomponent.pl index 10fa956c4..cb07b84fc 100755 --- a/scripts/movecomponent.pl +++ b/scripts/movecomponent.pl @@ -8,8 +8,8 @@ use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin '$RealBin'; +use lib "$RealBin/../..", "$RealBin/../../lib"; use Bugzilla; use Bugzilla::Component; diff --git a/scripts/nagios_blocker_checker.pl b/scripts/nagios_blocker_checker.pl index a6c5e5d7b..768053126 100755 --- a/scripts/nagios_blocker_checker.pl +++ b/scripts/nagios_blocker_checker.pl @@ -10,8 +10,9 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin qw($Bin); +use lib "$Bin/.."; +use lib "$Bin/../lib"; use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/nagios_push_checker.pl b/scripts/nagios_push_checker.pl index 1fa28bf1d..109f794d7 100755 --- a/scripts/nagios_push_checker.pl +++ b/scripts/nagios_push_checker.pl @@ -11,7 +11,7 @@ use strict; use warnings; use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib ("$RealBin/..", "$RealBin/../lib"); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/nightly_group_bug_cleaner.pl b/scripts/nightly_group_bug_cleaner.pl index a32588673..d8ce4cb54 100755 --- a/scripts/nightly_group_bug_cleaner.pl +++ b/scripts/nightly_group_bug_cleaner.pl @@ -8,10 +8,6 @@ use 5.10.1; use strict; use warnings; - -use FindBin; -use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5"; - use Bugzilla; use Bugzilla::Constants; use Bugzilla::Field; diff --git a/scripts/nuke-bugs.pl b/scripts/nuke-bugs.pl index 35774ff8d..0226c1726 100755 --- a/scripts/nuke-bugs.pl +++ b/scripts/nuke-bugs.pl @@ -8,8 +8,7 @@ use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(.); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/reassign_open_bugs.pl b/scripts/reassign_open_bugs.pl index 343a99617..6496f9a95 100755 --- a/scripts/reassign_open_bugs.pl +++ b/scripts/reassign_open_bugs.pl @@ -10,8 +10,8 @@ use 5.10.1; use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin '$RealBin'; +use lib "$RealBin/../..", "$RealBin/../../lib"; use Bugzilla; use Bugzilla::User; diff --git a/scripts/remove-non-public-data.pl b/scripts/remove-non-public-data.pl index 8b5d2b2e7..06fc693fa 100755 --- a/scripts/remove-non-public-data.pl +++ b/scripts/remove-non-public-data.pl @@ -9,7 +9,7 @@ use strict; use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib "$RealBin/..", "$RealBin/../lib"; use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/remove_idle_group_members.pl b/scripts/remove_idle_group_members.pl index 510d0623b..d0eda387a 100755 --- a/scripts/remove_idle_group_members.pl +++ b/scripts/remove_idle_group_members.pl @@ -10,8 +10,8 @@ use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin qw($Bin); +use lib "$Bin/.."; use Bugzilla; BEGIN { Bugzilla->extensions() } diff --git a/scripts/reset_default_user.pl b/scripts/reset_default_user.pl index 2888df48c..173d03849 100755 --- a/scripts/reset_default_user.pl +++ b/scripts/reset_default_user.pl @@ -8,8 +8,7 @@ use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib '.'; use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/sanitizeme.pl b/scripts/sanitizeme.pl index 8f241de34..64178f3f3 100755 --- a/scripts/sanitizeme.pl +++ b/scripts/sanitizeme.pl @@ -24,8 +24,8 @@ use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin '$RealBin'; +use lib "$RealBin/..", "$RealBin/lib"; use Bugzilla; use Bugzilla::Bug; diff --git a/scripts/security_remove.pl b/scripts/security_remove.pl index 7c01e8002..85f415218 100755 --- a/scripts/security_remove.pl +++ b/scripts/security_remove.pl @@ -10,8 +10,8 @@ use 5.10.1; use strict; use warnings; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin '$RealBin'; +use lib "$RealBin/../..", "$RealBin/../../lib"; use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/sendunsentbugmail.pl b/scripts/sendunsentbugmail.pl index 3dae4a341..eeee41ced 100755 --- a/scripts/sendunsentbugmail.pl +++ b/scripts/sendunsentbugmail.pl @@ -1,16 +1,29 @@ -#!/usr/bin/perl -T -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. +#!/usr/bin/perl -wT +# -*- Mode: perl; indent-tabs-mode: nil -*- # -# This Source Code Form is "Incompatible With Secondary Licenses", as -# defined by the Mozilla Public License, v. 2.0. +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Dave Miller <justdave@bugzilla.org> +# Myk Melez <myk@mozilla.org> use 5.10.1; use strict; -use warnings; - -use lib qw(. lib local/lib/perl5); +use lib qw(. lib); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/syncflags.pl b/scripts/syncflags.pl index 7250cdf89..520a8305c 100755 --- a/scripts/syncflags.pl +++ b/scripts/syncflags.pl @@ -24,8 +24,7 @@ use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(. lib); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/syncmsandversions.pl b/scripts/syncmsandversions.pl index e886d9e5b..20e88252e 100755 --- a/scripts/syncmsandversions.pl +++ b/scripts/syncmsandversions.pl @@ -24,8 +24,7 @@ use strict; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib qw(. lib); use Bugzilla; use Bugzilla::Constants; diff --git a/scripts/update-bug-groups.pl b/scripts/update-bug-groups.pl index 0aed32e9b..173269e7c 100755 --- a/scripts/update-bug-groups.pl +++ b/scripts/update-bug-groups.pl @@ -12,7 +12,7 @@ use warnings; $| = 1; use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib "$RealBin/..", "$RealBin/../lib"; use Bugzilla; use Bugzilla::CGI; diff --git a/scripts/update-crash-signatures.pl b/scripts/update-crash-signatures.pl index f8efca7ff..179d0decb 100755 --- a/scripts/update-crash-signatures.pl +++ b/scripts/update-crash-signatures.pl @@ -12,7 +12,7 @@ use warnings; $| = 1; use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use lib "$RealBin/..", "$RealBin/../lib"; use constant BATCH_SIZE => 100; diff --git a/scripts/user-prefs.pl b/scripts/user-prefs.pl index b7c860f48..ee980b3eb 100755 --- a/scripts/user-prefs.pl +++ b/scripts/user-prefs.pl @@ -10,8 +10,8 @@ use strict; use 5.10.1; -use FindBin qw($RealBin); -use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5"); +use FindBin qw( $RealBin ); +use lib ("$RealBin/..", "$RealBin/../lib"); use Bugzilla; use Bugzilla::Constants; |