Bug 1321662 - Ensure that Carp and Carp::Heavy are only loaded after @INC is setup with the vendor bundles

41 files changed, 139 insertions, 92 deletions

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;