Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e60c6f6

Browse files
committed
Set Perl search path more idiomatically
Back in commits 1df92ee, f884a96, and 592123e I used some hackish code to set the script search path, unaware despite decades of perl that there was a completely standard way to do this. This patch changes those cases to use the standard perl FindBin package.
1 parent 149f2ae commit e60c6f6

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

src/backend/catalog/genbki.pl

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
use warnings;
1818
use Getopt::Long;
1919

20-
use File::Basename;
21-
use File::Spec;
22-
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
20+
use FindBin;
21+
use lib $FindBin::RealBin;
2322

2423
use Catalog;
2524

src/tools/msvc/build.pl

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
use strict;
66
use warnings;
77

8-
use File::Basename;
9-
use File::Spec;
10-
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
8+
use FindBin;
9+
use lib $FindBin::RealBin;
1110

1211
use Cwd;
1312

src/tools/msvc/install.pl

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
use strict;
77
use warnings;
88

9-
use File::Basename;
10-
use File::Spec;
11-
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
9+
use FindBin;
10+
use lib $FindBin::RealBin;
1211

1312
use Install qw(Install);
1413

src/tools/msvc/mkvcbuild.pl

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
use strict;
88
use warnings;
99

10-
use File::Basename;
11-
use File::Spec;
12-
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
10+
use FindBin;
11+
use lib $FindBin::RealBin;
1312

1413
use Mkvcbuild;
1514

src/tools/msvc/vcregress.pl

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
use File::Copy;
1313
use File::Find ();
1414
use File::Path qw(rmtree);
15-
use File::Spec;
16-
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
15+
16+
use FindBin;
17+
use lib $FindBin::RealBin;
1718

1819
use Install qw(Install);
1920

0 commit comments

Comments
 (0)