Set Perl search path more idiomatically

adunstan · adunstan · commit e60c6f6ea17b · 2020-04-14T16:47:07.000-04:00
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.
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
@@ -17,9 +17,8 @@
 use warnings;
 use Getopt::Long;
 
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
 
 use Catalog;
 
diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl
@@ -5,9 +5,8 @@
 use strict;
 use warnings;
 
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
 
 use Cwd;
 
diff --git a/src/tools/msvc/install.pl b/src/tools/msvc/install.pl
@@ -6,9 +6,8 @@
 use strict;
 use warnings;
 
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
 
 use Install qw(Install);
 
diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl
@@ -7,9 +7,8 @@
 use strict;
 use warnings;
 
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
 
 use Mkvcbuild;
 
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
@@ -12,8 +12,9 @@
 use File::Copy;
 use File::Find ();
 use File::Path qw(rmtree);
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+
+use FindBin;
+use lib $FindBin::RealBin;
 
 use Install qw(Install);
 
